On the assumption that Issue 712446 is the bug for tracking progress to #enable-site-settings stuff, I'm commandeering this one to track progress on #enable-site-details. See the design doc found here: https://docs.google.com/document/d/1gQG1-QjOuswdwZC-yMhWai7divOPXiCp0mO82SO5VSs/edit#. I'll update the bug description also.

Moving bugs previously listed as this bug being blocked on; it seems like these should be the other way around. Note that all of the bugs currently listed as blocking on this one (except issue 709185) are actually all already blocking "Site Settings" (Issue 712446), which is probably also OK.

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

commit 325fa4c7d89214f89c3ff66432276130aeb414fb
Author: patricialor <patricialor@chromium.org>
Date: Mon May 08 07:51:31 2017

MD Settings: Add feature flag for showing content settings in a per-origin view.

Add feature flag #enable-site-details. Turning this flag on will (in future)
show UI in MD Settings to list all content settings for a specific origin.

BUG= 656758 

Review-Url: https://codereview.chromium.org/2854403003
Cr-Commit-Position: refs/heads/master@{#469917}

[modify] https://crrev.com/325fa4c7d89214f89c3ff66432276130aeb414fb/chrome/browser/about_flags.cc
[modify] https://crrev.com/325fa4c7d89214f89c3ff66432276130aeb414fb/chrome/browser/flag_descriptions.cc
[modify] https://crrev.com/325fa4c7d89214f89c3ff66432276130aeb414fb/chrome/browser/flag_descriptions.h
[modify] https://crrev.com/325fa4c7d89214f89c3ff66432276130aeb414fb/chrome/common/chrome_features.cc
[modify] https://crrev.com/325fa4c7d89214f89c3ff66432276130aeb414fb/chrome/common/chrome_features.h
[modify] https://crrev.com/325fa4c7d89214f89c3ff66432276130aeb414fb/tools/metrics/histograms/enums.xml

Updating this to P2 based on the fact that we're trying to get it landed :) 

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

commit f6d2eeee539252388096d5ddaf5644c093ad6c13
Author: patricialor <patricialor@chromium.org>
Date: Fri Jun 02 01:28:46 2017

MD Settings: Show all content settings in Site Details.

The "Site Details" page currently only shows content settings that are set to a
non-default setting for the given origin. This patch will show all content
settings in "Site Details", regardless of whether they are still set to the
default setting or not.

BUG= 656758 , 709171 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2912253003
Cr-Commit-Position: refs/heads/master@{#476514}

[modify] https://crrev.com/f6d2eeee539252388096d5ddaf5644c093ad6c13/chrome/browser/resources/settings/site_settings/site_details.html
[modify] https://crrev.com/f6d2eeee539252388096d5ddaf5644c093ad6c13/chrome/browser/resources/settings/site_settings/site_details_permission.html
[modify] https://crrev.com/f6d2eeee539252388096d5ddaf5644c093ad6c13/chrome/browser/resources/settings/site_settings/site_details_permission.js
[modify] https://crrev.com/f6d2eeee539252388096d5ddaf5644c093ad6c13/chrome/test/data/webui/settings/site_details_permission_tests.js
[modify] https://crrev.com/f6d2eeee539252388096d5ddaf5644c093ad6c13/chrome/test/data/webui/settings/site_details_tests.js

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

commit a21a04cf272f00d9478450dd072c113abe2d4b9c
Author: Patricia Lor <patricialor@chromium.org>
Date: Mon Jun 05 04:14:56 2017

Desktop Page Info: Point "Site settings" link to "Site Details" when enabled.

If the "Site Details" page (found in Chrome's MD Settings) is enabled,
(i.e. #enable-site-details or #enable-site-settings is on), allow the user to
navigate to the "Site Details" of the origin they are currently visiting via
clicking the "Site settings" link at the bottom of the Page Info bubble.

BUG= 655876 ,  656758 
TEST=With the #enable-site-details and/or the #enable-site-settings flag turned
on, navigate to https://www.permission.site/. Open the Page Info bubble by
clicking on the icon next to the URL in the Omnibox. At the bottom of the
bubble, click "Site settings". This should take you to
With both flags off, repeating the above steps should open a new tab with
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

chrome: //settings/content/siteDetails?site=https%3A%2F%2Fpermission.site%2F.
chrome: //settings/content
Change-Id: I6778534923ad2df5b15175ad476686b8491da7b3
Reviewed-on: https://chromium-review.googlesource.com/504067
Commit-Queue: Patricia Lor <patricialor@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Mike West <mkwst@google.com>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Reviewed-by: Dan Beam <dbeam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#476937}
[modify] https://crrev.com/a21a04cf272f00d9478450dd072c113abe2d4b9c/chrome/browser/resources/settings/route.js
[modify] https://crrev.com/a21a04cf272f00d9478450dd072c113abe2d4b9c/chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.mm
[modify] https://crrev.com/a21a04cf272f00d9478450dd072c113abe2d4b9c/chrome/browser/ui/page_info/page_info.cc
[modify] https://crrev.com/a21a04cf272f00d9478450dd072c113abe2d4b9c/chrome/browser/ui/page_info/page_info.h
[modify] https://crrev.com/a21a04cf272f00d9478450dd072c113abe2d4b9c/chrome/browser/ui/view_ids.h
[modify] https://crrev.com/a21a04cf272f00d9478450dd072c113abe2d4b9c/chrome/browser/ui/views/page_info/page_info_bubble_view.cc
[modify] https://crrev.com/a21a04cf272f00d9478450dd072c113abe2d4b9c/chrome/browser/ui/views/page_info/page_info_bubble_view.h
[add] https://crrev.com/a21a04cf272f00d9478450dd072c113abe2d4b9c/chrome/browser/ui/views/page_info/page_info_bubble_view_browsertest.cc
[delete] https://crrev.com/c3e34b2e51926d4b133aee54d3db4608c94707f3/chrome/browser/ui/views/page_info/page_info_bubble_view_interactive_uitest.cc
[modify] https://crrev.com/a21a04cf272f00d9478450dd072c113abe2d4b9c/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/a21a04cf272f00d9478450dd072c113abe2d4b9c/chrome/common/url_constants.cc
[modify] https://crrev.com/a21a04cf272f00d9478450dd072c113abe2d4b9c/chrome/common/url_constants.h
[modify] https://crrev.com/a21a04cf272f00d9478450dd072c113abe2d4b9c/chrome/test/BUILD.gn

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

commit f3b6e00fe2826406218b15bd2f317cfebe835696
Author: patricialor <patricialor@chromium.org>
Date: Fri Jun 30 03:19:37 2017

MD Settings: Set all content setting values in the <site-details> object.

r476514 changed the "Site Details" page to show all content settings instead of
the non-default ones. However, the back-end code supporting this UI still only
retrieved non-default settings. This CL fixes this problem to retrieve the
correct values for all content settings displayed, consistent with those shown
in the Page Info bubble.

Note that the "Site Details" UI will now only show the correct content setting
value for content settings that are non-default (previously, they were all
incorrect). A follow-up CL will be required to enable the UI to show default
settings, such as "Ask (default)", "Allow (default)" or "Block (default)"
values. Insecure (http) origins will also show that certain permissions have
been blocked, unlike the Page Info bubble.

See https://codereview.chromium.org/2946393002/ for C++ tests.

BUG= 656758 
TEST=With #enable-site-details turned on, navigate to https://permission.site.
Allow and deny a few permissions and verify these changes show up in the Page
Info bubble. Then click "Site settings" in the Page Info bubble, and check the
non-default 'Allow'- / 'Block'- ed content settings are also shown in the
"Site Details" page for https://permission.site and match the non-default values
shown in the Page Info bubble.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2936003003
Cr-Commit-Position: refs/heads/master@{#483614}

[modify] https://crrev.com/f3b6e00fe2826406218b15bd2f317cfebe835696/chrome/browser/resources/settings/site_settings/site_details.html
[modify] https://crrev.com/f3b6e00fe2826406218b15bd2f317cfebe835696/chrome/browser/resources/settings/site_settings/site_details.js
[modify] https://crrev.com/f3b6e00fe2826406218b15bd2f317cfebe835696/chrome/browser/resources/settings/site_settings/site_details_permission.js
[modify] https://crrev.com/f3b6e00fe2826406218b15bd2f317cfebe835696/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
[modify] https://crrev.com/f3b6e00fe2826406218b15bd2f317cfebe835696/chrome/browser/ui/webui/settings/site_settings_handler.cc
[modify] https://crrev.com/f3b6e00fe2826406218b15bd2f317cfebe835696/chrome/browser/ui/webui/settings/site_settings_handler.h
[modify] https://crrev.com/f3b6e00fe2826406218b15bd2f317cfebe835696/chrome/browser/ui/webui/site_settings_helper.cc
[modify] https://crrev.com/f3b6e00fe2826406218b15bd2f317cfebe835696/chrome/browser/ui/webui/site_settings_helper.h
[modify] https://crrev.com/f3b6e00fe2826406218b15bd2f317cfebe835696/chrome/test/data/webui/settings/site_details_permission_tests.js
[modify] https://crrev.com/f3b6e00fe2826406218b15bd2f317cfebe835696/chrome/test/data/webui/settings/site_details_tests.js
[modify] https://crrev.com/f3b6e00fe2826406218b15bd2f317cfebe835696/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js

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

commit d265af292d6342a1205dc206c7d1f9e87f0a2ce1
Author: patricialor <patricialor@chromium.org>
Date: Thu Jul 06 04:27:36 2017

MD Settings: Amend SiteSettingsHandlerTest.Origins to test "Site Details" code.

r483614 introduced SiteSettingsHandler::HandleGetOriginPermissions(), which
retrieves the content setting value for a list of ContentSettingsTypes for a
given origin via the PermissionManager. It only adds Javascript test coverage
for the new code, so add test coverage for the C++ side in this patch.

BUG= 656758 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2946393002
Cr-Commit-Position: refs/heads/master@{#484465}

[modify] https://crrev.com/d265af292d6342a1205dc206c7d1f9e87f0a2ce1/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc

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

commit 669c449c8cf589c21cdb6e212a1574d3dca1f5fb
Author: Patricia Lor <patricialor@chromium.org>
Date: Wed Jul 12 04:08:38 2017

MD Settings: Remove the Cookies content setting from the Site Details page.

Cookies have their own permissions, so a cookie created by one origin can
potentially also be read by other origins. Since the "Site Details" page only
shows origin-scoped permissions, having cookies in Site Details complicates the
UI by suggesting they can be cleared for only one origin. Instead, clearing
cookies for just one origin can cause other origins to enter an invalid state,
and render sites effectively broken. Avoid this problem by removing it from
Site Details entirely.

Note that cookie settings will still be available via chrome:settings ->
Advanced -> Content Settings -> Cookies.

the Page Info bubble and click "Site settings" to open the Site Details page.
Verify "Cookies" is not listed as one of the content settings there.

Bug:  656758 
Change-Id: I44ecd7aaea594659d286244380a8cd8d9510de4d
Test: With #enable-site-details on, navigate to https://permission.site. Open
Reviewed-on: https://chromium-review.googlesource.com/563137
Reviewed-by: Tim Sergeant <tsergeant@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Commit-Queue: Patricia Lor <patricialor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485835}
[modify] https://crrev.com/669c449c8cf589c21cdb6e212a1574d3dca1f5fb/chrome/browser/resources/settings/site_settings/site_details.html
[modify] https://crrev.com/669c449c8cf589c21cdb6e212a1574d3dca1f5fb/chrome/browser/resources/settings/site_settings/site_details_permission.html
[modify] https://crrev.com/669c449c8cf589c21cdb6e212a1574d3dca1f5fb/chrome/browser/resources/settings/site_settings/site_details_permission.js
[modify] https://crrev.com/669c449c8cf589c21cdb6e212a1574d3dca1f5fb/chrome/test/data/webui/settings/site_details_permission_tests.js
[modify] https://crrev.com/669c449c8cf589c21cdb6e212a1574d3dca1f5fb/chrome/test/data/webui/settings/site_details_tests.js

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

commit 3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d
Author: Patricia Lor <patricialor@chromium.org>
Date: Thu Jul 20 01:40:45 2017

MD Settings: Show default settings in the drop-down menu in Site Details.

The Site Details page currently only shows two options in the drop-down menu
for each permission, 'Allow' and 'Block'. This change adds a third option to the
list, which shows the default option, similar to the Page Info bubble.

The "Site Details" page that opens should show matching permissions to those
seen in the Page Info bubble, including the defaults - e.g. Javascript should be
"Allow (default)", Popups should be "Block (default)", and Camera should be
"Ask (default)". Navigating to chrome:settings/content/camera and toggling the
"Ask before accessing (recommended)" option should then make the Site Details
page for for https://permission.site show "Block (default)" next to the Camera
permission.

Bug:  656758 
Change-Id: I74cd332c44d8fcb1ab5c700e4fa394ce74fe973b
Test: With the #enable-site-details flag turned on, navigate to
https: //permission.site, open the Page Info bubble, and click "Site settings".
Reviewed-on: https://chromium-review.googlesource.com/558541
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Reviewed-by: calamity <calamity@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488086}
[modify] https://crrev.com/3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d/chrome/app/settings_strings.grdp
[modify] https://crrev.com/3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d/chrome/browser/resources/settings/site_settings/compiled_resources2.gyp
[modify] https://crrev.com/3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d/chrome/browser/resources/settings/site_settings/site_details.js
[modify] https://crrev.com/3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d/chrome/browser/resources/settings/site_settings/site_details_permission.html
[modify] https://crrev.com/3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d/chrome/browser/resources/settings/site_settings/site_details_permission.js
[modify] https://crrev.com/3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
[modify] https://crrev.com/3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
[modify] https://crrev.com/3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d/chrome/browser/ui/webui/settings/site_settings_handler.cc
[modify] https://crrev.com/3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d/chrome/browser/ui/webui/settings/site_settings_handler.h
[modify] https://crrev.com/3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
[modify] https://crrev.com/3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d/chrome/test/data/webui/settings/site_details_permission_tests.js
[modify] https://crrev.com/3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d/chrome/test/data/webui/settings/site_details_tests.js
[modify] https://crrev.com/3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d/chrome/test/data/webui/settings/site_list_tests.js
[modify] https://crrev.com/3dd6dab7ccef00e3efca855f1d4d53ea5fd61b2d/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js

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

commit 86d4e6cc94072855a80e902e7bf0ae466cd93c50
Author: Patricia Lor <patricialor@chromium.org>
Date: Fri Jul 21 06:54:56 2017

MD Settings: Add MIDI-SysEx to the Site Details page.

Since a driving factor behind releasing the "Site Details" page as part of MD
Settings is to replace default permissions in the Page Info bubble, the list of
permissions shown in "Site Details" should include all permissions shown in
the Page Info bubble. Add MIDI-SysEx to match it.

and check one of the permissions listed there is "MIDI devices".

Bug:  656758 
Test: With #enable-site-details turned on, navigate to
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Ic111c09c17aef557990ae4f522151b294ab84842
chrome: //settings/content/siteDetails?site=https%3A%2F%2Fpermission.site
Reviewed-on: https://chromium-review.googlesource.com/578758
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Tim Sergeant <tsergeant@chromium.org>
Reviewed-by: calamity <calamity@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488604}
[modify] https://crrev.com/86d4e6cc94072855a80e902e7bf0ae466cd93c50/chrome/browser/resources/settings/site_settings/site_details.html
[modify] https://crrev.com/86d4e6cc94072855a80e902e7bf0ae466cd93c50/chrome/test/data/webui/settings/all_sites_tests.js
[modify] https://crrev.com/86d4e6cc94072855a80e902e7bf0ae466cd93c50/chrome/test/data/webui/settings/site_details_tests.js
[modify] https://crrev.com/86d4e6cc94072855a80e902e7bf0ae466cd93c50/chrome/test/data/webui/settings/site_list_tests.js
[modify] https://crrev.com/86d4e6cc94072855a80e902e7bf0ae466cd93c50/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js

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

commit f603c205cd6a8ddabb2884658e2ab0ebce0b07e3
Author: Patricia Lor <patricialor@chromium.org>
Date: Tue Jul 25 04:44:12 2017

MD Settings: Add a non-pattern way to set origin permissions for Site Details.

Currently, setting origin-scoped permissions in "Site Details" calls
HostContentSettingMap::SetContentSettingCustomScope(). This is technically
supposed to only be used for setting ContentSettingPatterns, which can cross
over multiple origins, if the pattern allows for it.

To fix, implement a new method SiteSettingsHandler::HandleSetOriginPermissions,
which uses HostContentSettingMap::SetNarrowestContentSetting(), which only
handles origin-scoped permissions. This is more appropriate for Site Details,
which shows permissions for a specific origin.

"Site settings". When the "Site Details" page opens, change a few of the
permissions listed there away from the original setting, and verify that
a) The drop-down doesn't immediately switch back to the original setting.
b) Switching back to the tab with https://permission.site and opening the Page
Info bubble shows the change that was just made accurately.
c) Refreshing the "Site Details" page still shows the new setting in the
drop-downs.
Also try clicking the "Clear and Reset" button underneath all the permissions,
and verify that it sets all the permissions back to their default values (which
will show up in "Site Details" on refresh), and that this is reflected in the
Page Info bubble as well as "Site Details".

Bug:  656758 ,  747794 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I9fdae9214389a7da11bb03e5407f3b57c0da46dd
Test: Navigate to https://permission.site. Open the Page Info bubble, then click
Reviewed-on: https://chromium-review.googlesource.com/569551
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Reviewed-by: Ben Wells <benwells@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Reviewed-by: Tim Sergeant <tsergeant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#489232}
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/chrome/browser/extensions/api/content_settings/content_settings_api.cc
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/chrome/browser/extensions/api/content_settings/content_settings_store.cc
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/chrome/browser/resources/settings/site_settings/add_site_dialog.js
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/chrome/browser/resources/settings/site_settings/edit_exception_dialog.js
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/chrome/browser/resources/settings/site_settings/site_details.js
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/chrome/browser/resources/settings/site_settings/site_details_permission.js
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/chrome/browser/resources/settings/site_settings/site_list.js
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/chrome/browser/ui/webui/settings/site_settings_handler.cc
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/chrome/browser/ui/webui/settings/site_settings_handler.h
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/chrome/test/data/webui/settings/site_details_permission_tests.js
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/chrome/test/data/webui/settings/site_list_tests.js
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/components/content_settings/core/browser/content_settings_utils.cc
[modify] https://crrev.com/f603c205cd6a8ddabb2884658e2ab0ebce0b07e3/components/content_settings/core/browser/content_settings_utils_unittest.cc

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

commit 2fe050a552951afbb6cc9e71d45e431dba914f70
Author: Patricia Lor <patricialor@chromium.org>
Date: Wed Jul 26 05:39:33 2017

MD Settings: Site Details "Reset site settings" shows confirmation dialog.

Currently, clicking the "Clear and reset" button on the "Site Details" page
just clears all the permissions without any feedback to the user. This patch
shows a confirmation dialog before actually resetting the permissions.

'Reset site settings' and make sure a dialog comes up. Clicking 'RESET' on the
dialog closes it and refreshing the page shows that all the permissions are back
to default.

Bug:  656758 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Ice974ca3019a07307ff4c0013ed84b1f85fa9e24
Test: Navigate to
chrome: //settings/content/siteDetails?site=https://permission.site. Click
Reviewed-on: https://chromium-review.googlesource.com/571102
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Reviewed-by: calamity <calamity@chromium.org>
Reviewed-by: Tim Sergeant <tsergeant@chromium.org>
Commit-Queue: Patti <patricialor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#489561}
[modify] https://crrev.com/2fe050a552951afbb6cc9e71d45e431dba914f70/chrome/app/settings_strings.grdp
[modify] https://crrev.com/2fe050a552951afbb6cc9e71d45e431dba914f70/chrome/browser/resources/settings/site_settings/site_details.html
[modify] https://crrev.com/2fe050a552951afbb6cc9e71d45e431dba914f70/chrome/browser/resources/settings/site_settings/site_details.js
[modify] https://crrev.com/2fe050a552951afbb6cc9e71d45e431dba914f70/chrome/browser/resources/settings/site_settings/site_details_permission.html
[modify] https://crrev.com/2fe050a552951afbb6cc9e71d45e431dba914f70/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/2fe050a552951afbb6cc9e71d45e431dba914f70/chrome/test/data/webui/settings/site_details_tests.js

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

commit 02e4b5d1c1399c3beebb4bf8b1b250aa6db14adf
Author: Patti <patricialor@chromium.org>
Date: Mon Jul 31 08:10:20 2017

MD Settings: Use the serialized origin as a title for the Site Details page.

Match the mocks for Site Details and use the origin as the title for the Site
Details page.

This patch also strips off default ports, if they are included in the origin.

and verify the text next to the back arrow reads "https://randomsite.blah:324".
Navigate to
verify the text in the same spot reads "https://randomsite.blah".

Bug:  656758 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I2658e7ccbb950a0ce34c83d2e3504c3d8e0b55af
Test: Navigate to
chrome: //settings/content/siteDetails?site=https://randomsite.blah:324/path/blah
chrome: //settings/content/siteDetails?site=https://randomsite.blah:443 and
Reviewed-on: https://chromium-review.googlesource.com/567787
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Reviewed-by: calamity <calamity@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490727}
[modify] https://crrev.com/02e4b5d1c1399c3beebb4bf8b1b250aa6db14adf/chrome/app/settings_strings.grdp
[modify] https://crrev.com/02e4b5d1c1399c3beebb4bf8b1b250aa6db14adf/chrome/browser/plugins/flash_permission_context.cc
[modify] https://crrev.com/02e4b5d1c1399c3beebb4bf8b1b250aa6db14adf/chrome/browser/resources/settings/privacy_page/privacy_page.html
[modify] https://crrev.com/02e4b5d1c1399c3beebb4bf8b1b250aa6db14adf/chrome/browser/resources/settings/site_settings/site_details.html
[modify] https://crrev.com/02e4b5d1c1399c3beebb4bf8b1b250aa6db14adf/chrome/browser/resources/settings/site_settings/site_details.js
[modify] https://crrev.com/02e4b5d1c1399c3beebb4bf8b1b250aa6db14adf/chrome/browser/ui/webui/options/content_settings_handler.cc
[modify] https://crrev.com/02e4b5d1c1399c3beebb4bf8b1b250aa6db14adf/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/02e4b5d1c1399c3beebb4bf8b1b250aa6db14adf/chrome/browser/ui/webui/settings/site_settings_handler.cc
[modify] https://crrev.com/02e4b5d1c1399c3beebb4bf8b1b250aa6db14adf/chrome/browser/ui/webui/settings/site_settings_handler.h
[modify] https://crrev.com/02e4b5d1c1399c3beebb4bf8b1b250aa6db14adf/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
[modify] https://crrev.com/02e4b5d1c1399c3beebb4bf8b1b250aa6db14adf/chrome/browser/ui/webui/site_settings_helper.cc
[modify] https://crrev.com/02e4b5d1c1399c3beebb4bf8b1b250aa6db14adf/chrome/browser/ui/webui/site_settings_helper.h
[modify] https://crrev.com/02e4b5d1c1399c3beebb4bf8b1b250aa6db14adf/chrome/browser/ui/webui/site_settings_helper_unittest.cc
[modify] https://crrev.com/02e4b5d1c1399c3beebb4bf8b1b250aa6db14adf/chrome/test/data/webui/settings/site_details_permission_tests.js

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

commit 83d64205c6364e4f9535602bb4dc2cac808cc8e0
Author: Patricia Lor <patricialor@chromium.org>
Date: Tue Aug 01 02:27:49 2017

MD Settings: Add SiteSettingSources for embargo, insecure origin, kill switch.

Currently, the possible sources for a content setting able to be represented in
MD Site Settings are default, user-set, policy, and extensions. Complete the
list by adding new SiteSettingSources for embargo, insecure origins, and for the
permissions kill switch.

Bug:  656758 
Change-Id: Iba003998be3f2f46d7c74dfb137a43e112042183
Reviewed-on: https://chromium-review.googlesource.com/584631
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490837}
[modify] https://crrev.com/83d64205c6364e4f9535602bb4dc2cac808cc8e0/chrome/browser/permissions/permission_context_base.cc
[modify] https://crrev.com/83d64205c6364e4f9535602bb4dc2cac808cc8e0/chrome/browser/permissions/permission_manager_unittest.cc
[modify] https://crrev.com/83d64205c6364e4f9535602bb4dc2cac808cc8e0/chrome/browser/permissions/permission_result.h
[modify] https://crrev.com/83d64205c6364e4f9535602bb4dc2cac808cc8e0/chrome/browser/permissions/permission_uma_util.cc
[modify] https://crrev.com/83d64205c6364e4f9535602bb4dc2cac808cc8e0/chrome/browser/ui/webui/site_settings_helper.cc
[modify] https://crrev.com/83d64205c6364e4f9535602bb4dc2cac808cc8e0/chrome/browser/ui/webui/site_settings_helper.h
[modify] https://crrev.com/83d64205c6364e4f9535602bb4dc2cac808cc8e0/chrome/browser/ui/webui/site_settings_helper_unittest.cc

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

commit d2abaefa5dd4848325716ebb4ed2bc4bf2b31a90
Author: Patti <patricialor@chromium.org>
Date: Tue Aug 01 06:13:41 2017

MD Settings: Site Details shows the source of a non-user controlled setting.

When a permission setting is controlled by something other than the user (e.g.
enterprise policy, extensions, or embargo), describe the actual source with a
string displayed underneath the permission in Site Details.

Manual test - With #enable-site-details on, install 'Toggle Javascript' from the
Chrome Web Store. Enable it (it will have a red toggle switch in the icon).
Navigate to
chrome://settings/content/siteDetails?site=https%3A%2F%2Fpermission.site
and verify that the 'Javascript' permission reads 'Blocked by an extension'
underneath and its drop-down to change the permission is disabled. Also navigate
to chrome://settings/content/siteDetails?site=http%3A%2F%2Fpermission.site
and verify that most of the permissions there read 'Blocked to protect your
privacy'.

Bug:  656758 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I017968f0b5bce6cb72143d1de5a040369499e4b2
Reviewed-on: https://chromium-review.googlesource.com/588040
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490883}
[modify] https://crrev.com/d2abaefa5dd4848325716ebb4ed2bc4bf2b31a90/chrome/app/settings_strings.grdp
[modify] https://crrev.com/d2abaefa5dd4848325716ebb4ed2bc4bf2b31a90/chrome/browser/resources/settings/site_settings/constants.js
[modify] https://crrev.com/d2abaefa5dd4848325716ebb4ed2bc4bf2b31a90/chrome/browser/resources/settings/site_settings/site_details_permission.html
[modify] https://crrev.com/d2abaefa5dd4848325716ebb4ed2bc4bf2b31a90/chrome/browser/resources/settings/site_settings/site_details_permission.js
[modify] https://crrev.com/d2abaefa5dd4848325716ebb4ed2bc4bf2b31a90/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
[modify] https://crrev.com/d2abaefa5dd4848325716ebb4ed2bc4bf2b31a90/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
[modify] https://crrev.com/d2abaefa5dd4848325716ebb4ed2bc4bf2b31a90/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/d2abaefa5dd4848325716ebb4ed2bc4bf2b31a90/chrome/test/data/webui/settings/site_details_permission_tests.js
[modify] https://crrev.com/d2abaefa5dd4848325716ebb4ed2bc4bf2b31a90/chrome/test/data/webui/settings/site_details_tests.js

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

commit 770bcdd42c053c435d57910a225f87982667acbf
Author: Patti <patricialor@chromium.org>
Date: Tue Aug 01 13:15:52 2017

MD Settings: Only show Site Details "Usage" when #enable-site-settings is on.

Site Details shows a 'Usage' section, which describes the amount of storage used
by a website. Only show this when #enable-site-settings is on, since it's not in
scope for the first version of Site Details.

Manual test - With #enable-site-details on and #enable-site-settings off,
navigate to
chrome://settings/content/siteDetails?site=https%3A%2F%2Fpermission.site.
It should not show the 'Usage' heading, nor the 'Permissions' heading.
With both flags on, navigate to
chrome://settings/content/siteDetails?site=https%3A%2F%2Fpermission.site and
verify 'Usage' and 'Permissions' headings are both there, most likely with 'No
usage data' under 'Usage'. Then navigate to
chrome://settings/content/siteDetails?site=https%3A%2F%2Fwww.google.com and
again verify both headings are there, probably with a non-zero storage number
under 'Usage'.

Bug:  656758 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I2a5dd7de7fcd6f4c3270dce2bb51e22ab6e1cec0
Reviewed-on: https://chromium-review.googlesource.com/587516
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490962}
[modify] https://crrev.com/770bcdd42c053c435d57910a225f87982667acbf/chrome/app/settings_strings.grdp
[modify] https://crrev.com/770bcdd42c053c435d57910a225f87982667acbf/chrome/browser/resources/settings/site_settings/site_details.html
[modify] https://crrev.com/770bcdd42c053c435d57910a225f87982667acbf/chrome/browser/resources/settings/site_settings/site_details.js
[modify] https://crrev.com/770bcdd42c053c435d57910a225f87982667acbf/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/770bcdd42c053c435d57910a225f87982667acbf/chrome/test/data/webui/settings/site_details_tests.js

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

commit 3071381c4aad890703718b68076c50dabf692192
Author: Patti <patricialor@chromium.org>
Date: Wed Aug 02 06:23:08 2017

MD Settings: Changing permissions in Site Details triggers infobars for reload.

Changing a permission via the Site Details UI will now show an infobar prompting
the user to reload affected pages.

Manual test - With #enable-site-details on, navigate to https://permission.site
in two separate tabs, one in a new window, plus an additional tab on
https://www.google.com in either window. On one of the tabs with
https://permission.site open, open the Page Info bubble and click
"Site settings". Change 'Javascript' to 'Allow' and verify that infobars asking
to reload the page have appeared on both tabs with https://permission.site open,
but not on any other tabs.

Bug:  656758 
Change-Id: Ia4dec26488afa8281ba949c631bea675c453f088
Reviewed-on: https://chromium-review.googlesource.com/593418
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491285}
[modify] https://crrev.com/3071381c4aad890703718b68076c50dabf692192/chrome/browser/ui/webui/settings/site_settings_handler.cc
[modify] https://crrev.com/3071381c4aad890703718b68076c50dabf692192/chrome/browser/ui/webui/settings/site_settings_handler.h
[modify] https://crrev.com/3071381c4aad890703718b68076c50dabf692192/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc

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

commit b1b3d76b9b555d27607248e10dc05ca53c9ffeb7
Author: Patti <patricialor@chromium.org>
Date: Thu Aug 03 05:35:57 2017

MD Settings: Update Site Details dynamically when permissions change.

Make the Site Details web UI update permission values when they change without
needing to reload the Site Details page.

Manual test - With #enable-site-details on, open https://permission.site. Open
the Page Info bubble, click "Site settings", and drag the Site Details tab out
into a new window so that the https://permission.site and the Site Details
windows are viewable at the same time. On https://permission.site, open the Page
Info bubble and change a permission there. It should automatically update to
show the same permission in the Site Details page.

Bug:  656758 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: If1b28afbed3317a7ac43ada1d8ca02424137b50d
Reviewed-on: https://chromium-review.googlesource.com/595299
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491653}
[modify] https://crrev.com/b1b3d76b9b555d27607248e10dc05ca53c9ffeb7/chrome/browser/resources/settings/site_settings/site_details.js
[modify] https://crrev.com/b1b3d76b9b555d27607248e10dc05ca53c9ffeb7/chrome/browser/resources/settings/site_settings/site_details_permission.js
[modify] https://crrev.com/b1b3d76b9b555d27607248e10dc05ca53c9ffeb7/chrome/test/data/webui/settings/site_details_tests.js
[modify] https://crrev.com/b1b3d76b9b555d27607248e10dc05ca53c9ffeb7/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js

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

commit db108e87553a826e7b943e223583e96ce9f42c28
Author: Patti <patricialor@chromium.org>
Date: Fri Aug 04 10:08:23 2017

MD Settings: Update Site Details dynamically when default permissions change.

Make the Site Details web UI update the default permission strings when they
change without needing to reload the Site Details page.

Manual test - With #enable-site-details on, open https://permission.site. Open
the Page Info bubble, click "Site settings" to open the Site Details page. Make
sure the 'Location' setting is set to 'Ask (default)'. In a new window, open
chrome://settings/content/location and put the two windows side by side. On
chrome://settings/content/location, click the toggle to block location access by
default, and verify the Site Details page drop-down value for location changes
to 'Block (default)'.

Bug:  656758 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Id1c03acd9b636ea8463e382ae21cc646161267d9
Reviewed-on: https://chromium-review.googlesource.com/597030
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491982}
[modify] https://crrev.com/db108e87553a826e7b943e223583e96ce9f42c28/chrome/browser/resources/settings/site_settings/site_details_permission.js
[modify] https://crrev.com/db108e87553a826e7b943e223583e96ce9f42c28/chrome/test/data/webui/settings/site_details_permission_tests.js
[modify] https://crrev.com/db108e87553a826e7b943e223583e96ce9f42c28/chrome/test/data/webui/settings/site_details_tests.js
[modify] https://crrev.com/db108e87553a826e7b943e223583e96ce9f42c28/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js

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

commit ef7f14b6ae025efb48b1d8e244ced534910f4b30
Author: Patti <patricialor@chromium.org>
Date: Tue Aug 08 02:12:50 2017

MD Settings: Site Details CSS tweaks to match mocks.

Add more spacing underneath the origin name in Site Details.

Bug:  656758 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I4fe11eabb177c2b855b6200ad2f85064985f0916
Reviewed-on: https://chromium-review.googlesource.com/603031
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#492504}
[modify] https://crrev.com/ef7f14b6ae025efb48b1d8e244ced534910f4b30/chrome/browser/resources/settings/site_settings/site_details.html

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

commit b8524b114694517775824d192866f46014a80d71
Author: Patti <patricialor@chromium.org>
Date: Wed Aug 09 00:55:44 2017

MD Settings: Show "Ask" in Site Details dropdown for non-default sources.

Currently, the Site Details UI will show a blank dropdown menu when a site
setting is set to 'ask', but its source is not 'default'. Add a new non-default
'ask' value which is shown when the source is non-default.

Bug:  656758 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Iea5cf53e09f4d429938cabe002a84f7651cd4aac
Reviewed-on: https://chromium-review.googlesource.com/597469
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Commit-Queue: Patti <patricialor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#492794}
[modify] https://crrev.com/b8524b114694517775824d192866f46014a80d71/chrome/app/settings_strings.grdp
[modify] https://crrev.com/b8524b114694517775824d192866f46014a80d71/chrome/browser/resources/settings/site_settings/site_details_permission.html
[modify] https://crrev.com/b8524b114694517775824d192866f46014a80d71/chrome/browser/resources/settings/site_settings/site_details_permission.js
[modify] https://crrev.com/b8524b114694517775824d192866f46014a80d71/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/b8524b114694517775824d192866f46014a80d71/chrome/test/data/webui/settings/site_details_permission_tests.js
[modify] https://crrev.com/b8524b114694517775824d192866f46014a80d71/chrome/test/data/webui/settings/site_details_tests.js

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

commit 8dee9cf5fe59e33fa8fbba33e85bc986543de0f9
Author: Patti <patricialor@chromium.org>
Date: Wed Aug 09 08:09:34 2017

MD Settings: Site Details now allows users to override embargo.

Currently it is not possible to override embargo via Site Details, while it is
possible in the Page Info bubble. This patch fixes that.

Manual test - With #enable-site-details on, navigate to https://permission.site.
Click 'Notifications', wait for the prompt to appear, then press ESC to dismiss
the prompt. Repeat until the prompt no longer appears. Open the Page Info bubble
and verify 'Notifications' now has text underneath that reads 'Automatically
blocked'. Click 'Site settings' (a button at the bottom of the Page Info
bubble). Verify 'Automatically blocked' is now also in gray text underneath
'Notifications' in the Site Details page that opens up. Change the Notifications
permission now to 'Ask (default)'. Switch back to the https://permission.site
tab, refresh, and verify clicking the 'Notifications' button again shows a new
prompt asking for Notifications permission.

Bug:  656758 
Change-Id: I83251de4d90f191c5b1b7b2f23dd04966bc7ec60
Reviewed-on: https://chromium-review.googlesource.com/604768
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#492894}
[modify] https://crrev.com/8dee9cf5fe59e33fa8fbba33e85bc986543de0f9/chrome/browser/ui/webui/settings/site_settings_handler.cc

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

commit a2cc6c0095931cda4bc0e1adb4f0bdedaed215ec
Author: Patti <patricialor@chromium.org>
Date: Wed Aug 09 09:38:49 2017

MD Settings: Enable Site Details by default.

Site Details will eventually assume the Page Info bubble's responsibility for
showing all the permissions available to an origin. Get to Site Details by
opening the Page Info bubble on a site and clicking the 'Site settings' button.

This can be flipped via chrome://flags #enable-site-details, or passing the
command line option --enable-features=SiteDetails.

Bug:  656758 
Change-Id: Ib81b094a23578ba5efcbcb7272139ee160e6bf79
Reviewed-on: https://chromium-review.googlesource.com/602090
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Commit-Queue: Patti <patricialor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#492922}
[modify] https://crrev.com/a2cc6c0095931cda4bc0e1adb4f0bdedaed215ec/chrome/common/chrome_features.cc

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

commit c0ec71e754ccbadb0f3eba5d6df234b259612627
Author: Patti <patricialor@chromium.org>
Date: Wed Aug 16 02:37:09 2017

MD Settings: Fix handling of invalid urls in Site Details.

When an invalid site= query parameter is passed to Site Details, a blank heading
is shown. Trying to change one of the permissions then will result in a DCHECK
being hit. Fix both these problems by:

- Returning the user to the previous page/parent page when this happens.
- Returning early on invalid URLs.

Manual test - Navigate to chrome://settings/content/siteDetails?site=junk and
verify it takes you to chrome://settings/content/.

Bug:  656758 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I4b8f60c0ab3e3c95e43fc122259d6d1de814d703
Reviewed-on: https://chromium-review.googlesource.com/611760
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#494674}
[modify] https://crrev.com/c0ec71e754ccbadb0f3eba5d6df234b259612627/chrome/browser/resources/settings/site_settings/site_details.js
[modify] https://crrev.com/c0ec71e754ccbadb0f3eba5d6df234b259612627/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
[modify] https://crrev.com/c0ec71e754ccbadb0f3eba5d6df234b259612627/chrome/browser/ui/webui/settings/site_settings_handler.cc
[modify] https://crrev.com/c0ec71e754ccbadb0f3eba5d6df234b259612627/chrome/browser/ui/webui/settings/site_settings_handler.h
[modify] https://crrev.com/c0ec71e754ccbadb0f3eba5d6df234b259612627/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
[modify] https://crrev.com/c0ec71e754ccbadb0f3eba5d6df234b259612627/chrome/test/data/webui/settings/site_details_tests.js
[modify] https://crrev.com/c0ec71e754ccbadb0f3eba5d6df234b259612627/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js

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

commit bb5561268c278510a39f2090aa20da2686989136
Author: Patti <patricialor@chromium.org>
Date: Fri Aug 25 00:30:58 2017

MD Settings: Site Details now shows protected content setting on ChromeOS.

The Protected Media Identifier / Protected Content setting is missing from Site
Details. Add it.

Bug:  656758 , 647399
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I03078200f3533d6271c8fd76bcb53f2e3dbb9833
Reviewed-on: https://chromium-review.googlesource.com/628242
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#497257}
[modify] https://crrev.com/bb5561268c278510a39f2090aa20da2686989136/chrome/browser/resources/settings/site_settings/site_details.html
[modify] https://crrev.com/bb5561268c278510a39f2090aa20da2686989136/chrome/test/data/webui/settings/site_details_tests.js
[modify] https://crrev.com/bb5561268c278510a39f2090aa20da2686989136/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js

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

commit 3f2232ec42931da29ea04eb9be3657117b49f8fc
Author: Yoichi Osato <yoichio@chromium.org>
Date: Fri Aug 25 05:51:25 2017

Revert "MD Settings: Site Details now shows protected content setting on ChromeOS."

This reverts commit bb5561268c278510a39f2090aa20da2686989136.

Reason for revert: Findit found culprit 497257 with 96% for linux test failure:
confidencehttps://uberchromegw.corp.google.com/i/chromium.linux/builders/Linux%20Tests%20%28dbg%29%281%29

Original change's description:
> MD Settings: Site Details now shows protected content setting on ChromeOS.
> 
> The Protected Media Identifier / Protected Content setting is missing from Site
> Details. Add it.
> 
> Bug:  656758 , 647399
> Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
> Change-Id: I03078200f3533d6271c8fd76bcb53f2e3dbb9833
> Reviewed-on: https://chromium-review.googlesource.com/628242
> Commit-Queue: Patti <patricialor@chromium.org>
> Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#497257}

TBR=dschuyler@chromium.org,patricialor@chromium.org

Change-Id: Id7b9771b6b83805b6d88c7a8ae7da6140afaf5e2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  656758 , 647399
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Reviewed-on: https://chromium-review.googlesource.com/634883
Reviewed-by: Yoichi Osato <yoichio@chromium.org>
Commit-Queue: Yoichi Osato <yoichio@chromium.org>
Cr-Commit-Position: refs/heads/master@{#497331}
[modify] https://crrev.com/3f2232ec42931da29ea04eb9be3657117b49f8fc/chrome/browser/resources/settings/site_settings/site_details.html
[modify] https://crrev.com/3f2232ec42931da29ea04eb9be3657117b49f8fc/chrome/test/data/webui/settings/site_details_tests.js
[modify] https://crrev.com/3f2232ec42931da29ea04eb9be3657117b49f8fc/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js

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

commit 5f083d2363247abc9082cbc0f337e2efec4585fc
Author: Patti <patricialor@chromium.org>
Date: Thu Sep 07 02:13:19 2017

MD Settings: If on a file:// URL, don't navigate to Site Details via Page Info.

PermissionManager doesn't seem to support retrieving permission settings for
file:// scheme URLs, which means Site Details won't either. Temporarily disable
navigation to Site Details from a file:// URL until https://crbug.com/444047 can
be fixed.

Bug:  656758 , 444047, 762751
Change-Id: Ib12f0990e22e26e20706e976a6cb21c6def70c7d
Reviewed-on: https://chromium-review.googlesource.com/647355
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#500188}
[modify] https://crrev.com/5f083d2363247abc9082cbc0f337e2efec4585fc/chrome/browser/ui/page_info/page_info.cc
[modify] https://crrev.com/5f083d2363247abc9082cbc0f337e2efec4585fc/chrome/browser/ui/views/page_info/page_info_bubble_view_browsertest.cc

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

commit 10d0030fda6c0c115df95fc51c114d9b59769403
Author: Patti <patricialor@chromium.org>
Date: Fri Sep 08 04:14:35 2017

MD Settings: If on a file:// URL, don't navigate to Site Details via Page Info.

PermissionManager doesn't seem to support retrieving permission settings for
file:// scheme URLs, which means Site Details won't either. Temporarily disable
navigation to Site Details from a file:// URL until https://crbug.com/444047 can
be fixed.

TBR=patricialor@chromium.org

(cherry picked from commit 5f083d2363247abc9082cbc0f337e2efec4585fc)

Bug:  656758 , 444047, 762751
Change-Id: Ib12f0990e22e26e20706e976a6cb21c6def70c7d
Reviewed-on: https://chromium-review.googlesource.com/647355
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#500188}
Reviewed-on: https://chromium-review.googlesource.com/656864
Reviewed-by: Patti <patricialor@chromium.org>
Cr-Commit-Position: refs/branch-heads/3202@{#83}
Cr-Branched-From: fa6a5d87adff761bc16afc5498c3f5944c1daa68-refs/heads/master@{#499098}
[modify] https://crrev.com/10d0030fda6c0c115df95fc51c114d9b59769403/chrome/browser/ui/page_info/page_info.cc
[modify] https://crrev.com/10d0030fda6c0c115df95fc51c114d9b59769403/chrome/browser/ui/views/page_info/page_info_bubble_view_browsertest.cc

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

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

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

commit 80dac7ffe6771d2a32586f3abf1e02ebad94840b
Author: Patti <patricialor@chromium.org>
Date: Mon Sep 25 01:55:42 2017

MD Settings: Site Details now shows protected content setting on ChromeOS.

The Protected Media Identifier / Protected Content setting is missing from Site
Details. Add it.

Bug:  656758 , 647399
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Ieb458c5897a1628972effbf4cfabb7aaa69e9927
Reviewed-on: https://chromium-review.googlesource.com/641296
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Reviewed-by: calamity <calamity@chromium.org>
Commit-Queue: Patti <patricialor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#503968}
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/app/settings_strings.grdp
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/browser/resources/settings/route.js
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/browser/resources/settings/settings_resources.grd
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/browser/resources/settings/site_settings/compiled_resources2.gyp
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/browser/resources/settings/site_settings/constants.js
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/browser/resources/settings/site_settings/site_details.html
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/browser/resources/settings/site_settings/site_details.js
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/browser/resources/settings/site_settings/site_details_permission.html
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/browser/resources/settings/site_settings/site_details_permission.js
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/browser/ui/webui/settings/site_settings_handler.cc
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/browser/ui/webui/settings/site_settings_handler.h
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/browser/ui/webui/site_settings_helper.cc
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/browser/ui/webui/site_settings_helper.h
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/browser/ui/webui/site_settings_helper_unittest.cc
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/test/data/webui/settings/route_tests.js
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/test/data/webui/settings/site_details_permission_tests.js
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/test/data/webui/settings/site_details_tests.js
[modify] https://crrev.com/80dac7ffe6771d2a32586f3abf1e02ebad94840b/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js

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

commit e8cc7650d44155e942550b9c730eafc9c5ba8ab6
Author: Patti <patricialor@chromium.org>
Date: Thu Oct 05 01:04:43 2017

MD Settings: Update Protected Content strings in Site Settings.

Update the 'Protected Content' capitalized casing in chrome://settings/content
to sentence casing to be consistent with other content settings. Also update
the Site Details 'Protected Content' string to read 'Protected content
identifiers', since this is actually the per-site setting that this control is
turning on and off.

Bug:  656758 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Ibf21d2cca5bfea6dd244b543d23b284b26d0b4f2
Reviewed-on: https://chromium-review.googlesource.com/683496
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Commit-Queue: Patti <patricialor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506599}
[modify] https://crrev.com/e8cc7650d44155e942550b9c730eafc9c5ba8ab6/chrome/app/settings_strings.grdp
[modify] https://crrev.com/e8cc7650d44155e942550b9c730eafc9c5ba8ab6/chrome/browser/resources/settings/site_settings/site_details.html
[modify] https://crrev.com/e8cc7650d44155e942550b9c730eafc9c5ba8ab6/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/e8cc7650d44155e942550b9c730eafc9c5ba8ab6/chrome/test/data/webui/settings/site_details_permission_tests.js

Should we mark this as fixed? 

Ooh, yeah I left it open to remind myself to delete the flag. Feel free to file a new bug if you want to though since I won't get to it til later this month probably.

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

commit 69d47441c1ead44876c6c23c513f8987ea1f33d8
Author: Patti <patricialor@chromium.org>
Date: Wed Nov 15 06:22:02 2017

Settings: Delete Site Details flag.

Site Details was launched in m62. Clean up by deleting the flag.

Bug:  656758 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I68a7aa8ef292c3489147f1fe09e3b5f03338a124
Reviewed-on: https://chromium-review.googlesource.com/765630
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Reviewed-by: Lucas Garron <lgarron@chromium.org>
Commit-Queue: Patti <patricialor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#516606}
[modify] https://crrev.com/69d47441c1ead44876c6c23c513f8987ea1f33d8/chrome/browser/about_flags.cc
[modify] https://crrev.com/69d47441c1ead44876c6c23c513f8987ea1f33d8/chrome/browser/flag_descriptions.cc
[modify] https://crrev.com/69d47441c1ead44876c6c23c513f8987ea1f33d8/chrome/browser/flag_descriptions.h
[modify] https://crrev.com/69d47441c1ead44876c6c23c513f8987ea1f33d8/chrome/browser/resources/settings/route.js
[modify] https://crrev.com/69d47441c1ead44876c6c23c513f8987ea1f33d8/chrome/browser/ui/chrome_pages.cc
[modify] https://crrev.com/69d47441c1ead44876c6c23c513f8987ea1f33d8/chrome/browser/ui/page_info/page_info.cc
[modify] https://crrev.com/69d47441c1ead44876c6c23c513f8987ea1f33d8/chrome/browser/ui/page_info/page_info_unittest.cc
[modify] https://crrev.com/69d47441c1ead44876c6c23c513f8987ea1f33d8/chrome/browser/ui/views/page_info/page_info_bubble_view_browsertest.cc
[modify] https://crrev.com/69d47441c1ead44876c6c23c513f8987ea1f33d8/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/69d47441c1ead44876c6c23c513f8987ea1f33d8/chrome/common/chrome_features.cc
[modify] https://crrev.com/69d47441c1ead44876c6c23c513f8987ea1f33d8/chrome/common/chrome_features.h

Yay!