The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/d8476bf05b4af9f48e7bda417b36bce2cac964ab

commit d8476bf05b4af9f48e7bda417b36bce2cac964ab
Author: Patti <patricialor@chromium.org>
Date: Tue Sep 12 01:16:33 2017

MD Settings: Re-separate codepaths for getting display names in Site Settings.

Before r490727, Site Settings / Content Settings always interpreted URLs to be
either an extension (in which the extension name would be retrieved) or a
ContentSettingsPattern. r490727 introduced a third option which was to display
the URL as the origin it belongs to (including stripping any default port
numbers) by checking whether the pattern was a valid origin. However, this
introduced a bug where 'https://*' would be intrepreted as a valid origin and be
displayed as 'https://%2A' in cases where it should have stayed a
ContentSettingsPattern.

Fix this by re-separating the codepaths for getting a pattern display name and
getting an origin display name.

Manual test - Navigate to chrome://settings/content/flash/ and add a new 'Block'
exception for 'http://*'. This should show up as typed and not get converted to
'http://%2A'.

Bug:  656758 ,  762754 
Change-Id: Ifa6c5f94e4485c7e78f1262a357b219e3cb86c19
Reviewed-on: https://chromium-review.googlesource.com/612025
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Reviewed-by: Martin Šrámek <msramek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501136}
[modify] https://crrev.com/d8476bf05b4af9f48e7bda417b36bce2cac964ab/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
[modify] https://crrev.com/d8476bf05b4af9f48e7bda417b36bce2cac964ab/chrome/browser/ui/webui/site_settings_helper.cc
[modify] https://crrev.com/d8476bf05b4af9f48e7bda417b36bce2cac964ab/chrome/browser/ui/webui/site_settings_helper_unittest.cc

CC laforge@ - apologies, I should have done this earlier.

I'm bumping up the priority to Pri-1 - it should have always been higher, since the use-case described in the bug description is advice given out to users who want to make exceptions for flash deprecation.

Your change meets the bar and is auto-approved for M62. Please go ahead and merge the CL to branch 3202 manually. Please contact milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), bhthompson@(ChromeOS), abdulsyed@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/cebdc93527542fe09bcf7f4e496c5905fc0748fa

commit cebdc93527542fe09bcf7f4e496c5905fc0748fa
Author: Patti <patricialor@chromium.org>
Date: Thu Sep 14 14:08:19 2017

MD Settings: Re-separate codepaths for getting display names in Site Settings.

Before r490727, Site Settings / Content Settings always interpreted URLs to be
either an extension (in which the extension name would be retrieved) or a
ContentSettingsPattern. r490727 introduced a third option which was to display
the URL as the origin it belongs to (including stripping any default port
numbers) by checking whether the pattern was a valid origin. However, this
introduced a bug where 'https://*' would be intrepreted as a valid origin and be
displayed as 'https://%2A' in cases where it should have stayed a
ContentSettingsPattern.

Fix this by re-separating the codepaths for getting a pattern display name and
getting an origin display name.

Manual test - Navigate to chrome://settings/content/flash/ and add a new 'Block'
exception for 'http://*'. This should show up as typed and not get converted to
'http://%2A'.

Bug:  656758 ,  762754 
Change-Id: Ifa6c5f94e4485c7e78f1262a357b219e3cb86c19
Reviewed-on: https://chromium-review.googlesource.com/612025
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Reviewed-by: Martin Šrámek <msramek@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#501136}(cherry picked from commit d8476bf05b4af9f48e7bda417b36bce2cac964ab)
Reviewed-on: https://chromium-review.googlesource.com/667496
Reviewed-by: Anthony LaForge <laforge@chromium.org>
Cr-Commit-Position: refs/branch-heads/3202@{#219}
Cr-Branched-From: fa6a5d87adff761bc16afc5498c3f5944c1daa68-refs/heads/master@{#499098}
[modify] https://crrev.com/cebdc93527542fe09bcf7f4e496c5905fc0748fa/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
[modify] https://crrev.com/cebdc93527542fe09bcf7f4e496c5905fc0748fa/chrome/browser/ui/webui/site_settings_helper.cc
[modify] https://crrev.com/cebdc93527542fe09bcf7f4e496c5905fc0748fa/chrome/browser/ui/webui/site_settings_helper_unittest.cc

Thanks laforge@ for the merge - I was waiting to verify the change works in Canary before merging, but didn't get round to it yet. Have checked now though - verified in 63.0.3215.0.