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

commit cda94daf85133a29be61558d556d1fdc3412d088
Author: meredithl <meredithl@google.com>
Date: Thu Jan 19 03:03:35 2017

Implement embargo in PermissionDecisionAutoBlocker

Creates an embargo state for a permission request for a given origin. An
origin will remain under embargo for a certain amount of time, where any
requests it makes for the permission it is under embargo for will be
automatically blocked. After the embargo state is lifted, it will either
be allowed to request permissions again, or be placed under embargo
again if it remains blacklisted by Safe Browsing. In future, there may
be more cases for assigning the embargo state, but for now it is just
for Permissions Blacklisting.

The embargo state is stored as a date for when the embargo was placed,
which is kept inside the permission dictionary for the given
origin and profile.

BUG= 679877 

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

[modify] https://crrev.com/cda94daf85133a29be61558d556d1fdc3412d088/chrome/browser/permissions/permission_context_base.cc
[modify] https://crrev.com/cda94daf85133a29be61558d556d1fdc3412d088/chrome/browser/permissions/permission_context_base_unittest.cc
[modify] https://crrev.com/cda94daf85133a29be61558d556d1fdc3412d088/chrome/browser/permissions/permission_decision_auto_blocker.cc
[modify] https://crrev.com/cda94daf85133a29be61558d556d1fdc3412d088/chrome/browser/permissions/permission_decision_auto_blocker.h
[modify] https://crrev.com/cda94daf85133a29be61558d556d1fdc3412d088/chrome/browser/permissions/permission_decision_auto_blocker_unittest.cc

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

commit 03b128552363baf102bafecf0dc45d201cfb43f1
Author: meredithl <meredithl@google.com>
Date: Wed Jan 25 05:08:01 2017

Convert PermissionDecisionAutoBlocker to a KeyedService.

In order to avoid passing around the profile, safe browsing database
PermissionDecisionAutoBlocker now keeps track of the database manager
and timeout. This means that testing this is now done within a unit test
of this class, rather than PermissionContextBase. The autoblocker now
handles the database manager entirely as well as the timeout. This allows
for the blacklisting pathway to be unit tested, as well as integration
tested in PermissionContextBase.

BUG= 679877 

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

[modify] https://crrev.com/03b128552363baf102bafecf0dc45d201cfb43f1/chrome/browser/browsing_data/browsing_data_remover_impl_unittest.cc
[modify] https://crrev.com/03b128552363baf102bafecf0dc45d201cfb43f1/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
[modify] https://crrev.com/03b128552363baf102bafecf0dc45d201cfb43f1/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
[modify] https://crrev.com/03b128552363baf102bafecf0dc45d201cfb43f1/chrome/browser/permissions/permission_blacklist_client.cc
[modify] https://crrev.com/03b128552363baf102bafecf0dc45d201cfb43f1/chrome/browser/permissions/permission_blacklist_client.h
[modify] https://crrev.com/03b128552363baf102bafecf0dc45d201cfb43f1/chrome/browser/permissions/permission_context_base.cc
[modify] https://crrev.com/03b128552363baf102bafecf0dc45d201cfb43f1/chrome/browser/permissions/permission_context_base.h
[modify] https://crrev.com/03b128552363baf102bafecf0dc45d201cfb43f1/chrome/browser/permissions/permission_context_base_unittest.cc
[modify] https://crrev.com/03b128552363baf102bafecf0dc45d201cfb43f1/chrome/browser/permissions/permission_decision_auto_blocker.cc
[modify] https://crrev.com/03b128552363baf102bafecf0dc45d201cfb43f1/chrome/browser/permissions/permission_decision_auto_blocker.h
[modify] https://crrev.com/03b128552363baf102bafecf0dc45d201cfb43f1/chrome/browser/permissions/permission_decision_auto_blocker_unittest.cc
[modify] https://crrev.com/03b128552363baf102bafecf0dc45d201cfb43f1/chrome/browser/permissions/permission_uma_util.cc
[modify] https://crrev.com/03b128552363baf102bafecf0dc45d201cfb43f1/chrome/browser/permissions/permission_util.cc
[modify] https://crrev.com/03b128552363baf102bafecf0dc45d201cfb43f1/chrome/browser/permissions/permission_util.h

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

commit 0cbf28a038b56406d8a8e2b4d6d70368b094e515
Author: meredithl <meredithl@google.com>
Date: Fri Feb 10 00:34:53 2017

Add metrics for Safe Browsing blacklist response.

Implements tracking of the response received from Safe Browsing when
querying the API blacklist, and the response time. Both metrics are
recorded in the PermissionBlacklistClient and implemented in
PermissionUmaUtil.

BUG= 679877 

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

[modify] https://crrev.com/0cbf28a038b56406d8a8e2b4d6d70368b094e515/chrome/browser/permissions/permission_blacklist_client.cc
[modify] https://crrev.com/0cbf28a038b56406d8a8e2b4d6d70368b094e515/chrome/browser/permissions/permission_blacklist_client.h
[modify] https://crrev.com/0cbf28a038b56406d8a8e2b4d6d70368b094e515/chrome/browser/permissions/permission_decision_auto_blocker_unittest.cc
[modify] https://crrev.com/0cbf28a038b56406d8a8e2b4d6d70368b094e515/chrome/browser/permissions/permission_uma_util.cc
[modify] https://crrev.com/0cbf28a038b56406d8a8e2b4d6d70368b094e515/chrome/browser/permissions/permission_uma_util.h
[modify] https://crrev.com/0cbf28a038b56406d8a8e2b4d6d70368b094e515/tools/metrics/histograms/histograms.xml

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

commit 79b96cce371bead70ed2dccf7977e5f1fd09c6a0
Author: dominickn <dominickn@chromium.org>
Date: Tue Feb 14 04:14:21 2017

Add UMA for recording embargo reasons and autoblocker interactions.

PermissionContextBase will now record interactions with
PermissionDecisionAutoBlocker, in particular those that lead to
embargoing of permission requests. Permission requests will fall into
one of the following buckets: embargo due to blacklisting, embargo due
to dismissals, or no embargo. The purpose of this UMA is to record when
and for what reason requests are placed under embargo. A follow up CL
will provide UMA for recording how often permission prompts aren't shown
due to existing embargo, and another will cover repeated embargo.

BUG= 679877 

Patch from http://crrev.com/2684913002#ps140001

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

[modify] https://crrev.com/79b96cce371bead70ed2dccf7977e5f1fd09c6a0/chrome/browser/permissions/permission_context_base.cc
[modify] https://crrev.com/79b96cce371bead70ed2dccf7977e5f1fd09c6a0/chrome/browser/permissions/permission_context_base_unittest.cc
[modify] https://crrev.com/79b96cce371bead70ed2dccf7977e5f1fd09c6a0/chrome/browser/permissions/permission_decision_auto_blocker.cc
[modify] https://crrev.com/79b96cce371bead70ed2dccf7977e5f1fd09c6a0/chrome/browser/permissions/permission_queue_controller.cc
[modify] https://crrev.com/79b96cce371bead70ed2dccf7977e5f1fd09c6a0/chrome/browser/permissions/permission_request_impl.cc
[modify] https://crrev.com/79b96cce371bead70ed2dccf7977e5f1fd09c6a0/chrome/browser/permissions/permission_uma_util.cc
[modify] https://crrev.com/79b96cce371bead70ed2dccf7977e5f1fd09c6a0/chrome/browser/permissions/permission_uma_util.h
[modify] https://crrev.com/79b96cce371bead70ed2dccf7977e5f1fd09c6a0/tools/metrics/histograms/histograms.xml

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

commit ab35971d1da1c791761f65f8dbd6df9512fd2c4d
Author: raymes <raymes@chromium.org>
Date: Wed Feb 15 06:23:25 2017

Add a source to the result of PermissionContextBase::GetPermissionStatus

There are several different cases where it is helpful to know the source
or reason for a particular permission status being returned. The
immediate reason for needing this is to properly measure metrics for the
PermissionDecisionAutoBlocker.

This CL provides the first steps towards exposing permission decision
information. PermissionContextBase::GetPermissionStatus now returns a
PermissionResult which includes both the content setting being returned,
as well as a PermissionStatusSource which describes the reason for the
setting.

Some initial reasons have been added, specifically:
-MULTIPLE_DISMISSALS - when a permission is blocked as a result of multiple
dismissals.
-SAFE_BROWSING_BLACKLIST - when a permission is blocked because the origin is
on the safe browsing blacklist.

These will be hooked up in a subsequent CL.

BUG= 679877 
TBR=peter@chromium.org,michaeln@chromium.org,sergeyu@chromium.org

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

[modify] https://crrev.com/ab35971d1da1c791761f65f8dbd6df9512fd2c4d/chrome/browser/geolocation/geolocation_permission_context_android.cc
[modify] https://crrev.com/ab35971d1da1c791761f65f8dbd6df9512fd2c4d/chrome/browser/media/midi_permission_context_unittest.cc
[modify] https://crrev.com/ab35971d1da1c791761f65f8dbd6df9512fd2c4d/chrome/browser/media/webrtc/media_stream_device_permission_context_unittest.cc
[modify] https://crrev.com/ab35971d1da1c791761f65f8dbd6df9512fd2c4d/chrome/browser/notifications/notification_permission_context_unittest.cc
[modify] https://crrev.com/ab35971d1da1c791761f65f8dbd6df9512fd2c4d/chrome/browser/permissions/permission_context_base.cc
[modify] https://crrev.com/ab35971d1da1c791761f65f8dbd6df9512fd2c4d/chrome/browser/permissions/permission_context_base.h
[modify] https://crrev.com/ab35971d1da1c791761f65f8dbd6df9512fd2c4d/chrome/browser/permissions/permission_context_base_unittest.cc
[modify] https://crrev.com/ab35971d1da1c791761f65f8dbd6df9512fd2c4d/chrome/browser/permissions/permission_manager.cc
[modify] https://crrev.com/ab35971d1da1c791761f65f8dbd6df9512fd2c4d/chrome/browser/storage/durable_storage_permission_context.cc
[modify] https://crrev.com/ab35971d1da1c791761f65f8dbd6df9512fd2c4d/chrome/browser/storage/durable_storage_permission_context_unittest.cc

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

commit 2391315fa51475da9ea5314ed81990e709644659
Author: dominickn <dominickn@chromium.org>
Date: Thu Feb 23 12:04:02 2017

Implement permission embargo suppression metrics.

This CL adds a new UMA histogram to record whether or not permission
prompts are suppressed due to embargo. This allows us to measure how
effective embargo is at reducing the number of prompts seen by users.

New histogram tests are implemented to verify that the metrics are
recorded as expected.

BUG= 679877 

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

[modify] https://crrev.com/2391315fa51475da9ea5314ed81990e709644659/chrome/browser/permissions/permission_context_base.cc
[modify] https://crrev.com/2391315fa51475da9ea5314ed81990e709644659/chrome/browser/permissions/permission_context_base.h
[modify] https://crrev.com/2391315fa51475da9ea5314ed81990e709644659/chrome/browser/permissions/permission_context_base_unittest.cc
[modify] https://crrev.com/2391315fa51475da9ea5314ed81990e709644659/chrome/browser/permissions/permission_decision_auto_blocker.cc
[modify] https://crrev.com/2391315fa51475da9ea5314ed81990e709644659/chrome/browser/permissions/permission_decision_auto_blocker.h
[modify] https://crrev.com/2391315fa51475da9ea5314ed81990e709644659/chrome/browser/permissions/permission_decision_auto_blocker_unittest.cc
[modify] https://crrev.com/2391315fa51475da9ea5314ed81990e709644659/chrome/browser/permissions/permission_infobar_delegate.cc
[modify] https://crrev.com/2391315fa51475da9ea5314ed81990e709644659/chrome/browser/permissions/permission_queue_controller.cc
[modify] https://crrev.com/2391315fa51475da9ea5314ed81990e709644659/chrome/browser/permissions/permission_request_impl.cc
[modify] https://crrev.com/2391315fa51475da9ea5314ed81990e709644659/chrome/browser/permissions/permission_uma_util.cc
[modify] https://crrev.com/2391315fa51475da9ea5314ed81990e709644659/chrome/browser/permissions/permission_uma_util.h
[modify] https://crrev.com/2391315fa51475da9ea5314ed81990e709644659/chrome/browser/permissions/permission_util.cc
[modify] https://crrev.com/2391315fa51475da9ea5314ed81990e709644659/chrome/browser/permissions/permission_util.h
[modify] https://crrev.com/2391315fa51475da9ea5314ed81990e709644659/tools/metrics/histograms/histograms.xml

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

commit 99b1bb0927bf4837bccbe01498b76860e455485f
Author: dominickn <dominickn@chromium.org>
Date: Thu Feb 23 12:14:56 2017

Verify that clearing browsing data clears permission embargo.

This CL improves the existing permission decision auto blocker tests in
ChromeBrowsingDataRemoveDelegateTest. It verifies that multiple
dismissals cause a permission to be embargoed, and that clearing history
and clearing site data erases any existing embargo state.

BUG= 679877 

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

[modify] https://crrev.com/99b1bb0927bf4837bccbe01498b76860e455485f/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc

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

commit f5b5d2155c0b5820cf2d354ee784ff16f5186853
Author: dominickn <dominickn@chromium.org>
Date: Thu Feb 23 22:46:18 2017

Make the PermissionDecisionAutoBlocker API consistent.

This CL standardises the argument and method ordering for
PermissionDecisionAutoBlocker to make it more consistent.

BUG= 679877 

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

[modify] https://crrev.com/f5b5d2155c0b5820cf2d354ee784ff16f5186853/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
[modify] https://crrev.com/f5b5d2155c0b5820cf2d354ee784ff16f5186853/chrome/browser/permissions/permission_blacklist_client.cc
[modify] https://crrev.com/f5b5d2155c0b5820cf2d354ee784ff16f5186853/chrome/browser/permissions/permission_blacklist_client.h
[modify] https://crrev.com/f5b5d2155c0b5820cf2d354ee784ff16f5186853/chrome/browser/permissions/permission_context_base.cc
[modify] https://crrev.com/f5b5d2155c0b5820cf2d354ee784ff16f5186853/chrome/browser/permissions/permission_decision_auto_blocker.cc
[modify] https://crrev.com/f5b5d2155c0b5820cf2d354ee784ff16f5186853/chrome/browser/permissions/permission_decision_auto_blocker.h
[modify] https://crrev.com/f5b5d2155c0b5820cf2d354ee784ff16f5186853/chrome/browser/permissions/permission_decision_auto_blocker_unittest.cc

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

commit 3c20e2d031c75de77442d5dbb6cca41adaf390f6
Author: dominickn <dominickn@chromium.org>
Date: Fri Feb 24 03:18:23 2017

Split out PermissionResult and PermissionStatusSource into a new cc/h file.

BUG= 679877 

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

[modify] https://crrev.com/3c20e2d031c75de77442d5dbb6cca41adaf390f6/chrome/browser/BUILD.gn
[modify] https://crrev.com/3c20e2d031c75de77442d5dbb6cca41adaf390f6/chrome/browser/permissions/permission_context_base.cc
[modify] https://crrev.com/3c20e2d031c75de77442d5dbb6cca41adaf390f6/chrome/browser/permissions/permission_context_base.h
[modify] https://crrev.com/3c20e2d031c75de77442d5dbb6cca41adaf390f6/chrome/browser/permissions/permission_decision_auto_blocker.cc
[modify] https://crrev.com/3c20e2d031c75de77442d5dbb6cca41adaf390f6/chrome/browser/permissions/permission_decision_auto_blocker.h
[add] https://crrev.com/3c20e2d031c75de77442d5dbb6cca41adaf390f6/chrome/browser/permissions/permission_result.cc
[add] https://crrev.com/3c20e2d031c75de77442d5dbb6cca41adaf390f6/chrome/browser/permissions/permission_result.h
[modify] https://crrev.com/3c20e2d031c75de77442d5dbb6cca41adaf390f6/chrome/browser/permissions/permission_uma_util.h
[modify] https://crrev.com/3c20e2d031c75de77442d5dbb6cca41adaf390f6/chrome/browser/permissions/permission_util.cc
[modify] https://crrev.com/3c20e2d031c75de77442d5dbb6cca41adaf390f6/chrome/browser/permissions/permission_util.h

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

commit d9fb73c14f0a2708be39521df7fa977cf902a049
Author: dominickn <dominickn@chromium.org>
Date: Wed Mar 01 03:34:18 2017

Add a console message when a permission is embargoed due to repeated dismissals.

This CL adds a console log to help inform developers if they have had
their permission blocked due to repeated dismissals.

BUG= 679877 

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

[modify] https://crrev.com/d9fb73c14f0a2708be39521df7fa977cf902a049/chrome/browser/permissions/permission_context_base.cc

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

commit 42dc98ada07c2bcd71a992aa289147dcc83f9881
Author: dominickn <dominickn@chromium.org>
Date: Fri Mar 03 01:35:53 2017

Update Android site settings to display BLOCK for embargoed permissions.

The permissions team has introduced a new temporary block state for
permissions called embargo. Origins may be placed under this state if
their prompts are dismissed too many times, or if they are blacklsited by
Safe Browsing. Embargo is stored on a separate content settings type to
avoid polluting the existing type for each permission.

This CL updates the WebsitePreferenceBridge to query the
PermissionManager and the PERMISSION_AUTOBLOCKER_DATA content settings
type in order to properly display embargoed permissions as blocked in
site settings on Android.

A consequence of this change is that the GeolocationHeader tests began
failing. This is because the implementation would fall back to querying
for HTTP permission if HTTPS permission was ASK or not available.
Since WebsitePreferenceBridge now queries the PermissionManager,
geolocation permission is automatically blocked over non-HTTPS
connections; it previously directly queried the HostContentSettingsMap.
The code implementing the fallback and related comments have been
removed as geolocation has been restricted to HTTPS origins since Chrome
50.

Additionally, the preferences search engine test fails because it tries
to check geolocation access for http://aol.com. That test is updated to
use a different search engine for that part of the test (one that is
available over HTTPS).

BUG= 679877 

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

[modify] https://crrev.com/42dc98ada07c2bcd71a992aa289147dcc83f9881/chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeader.java
[modify] https://crrev.com/42dc98ada07c2bcd71a992aa289147dcc83f9881/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderTest.java
[modify] https://crrev.com/42dc98ada07c2bcd71a992aa289147dcc83f9881/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java
[modify] https://crrev.com/42dc98ada07c2bcd71a992aa289147dcc83f9881/chrome/browser/android/preferences/website_preference_bridge.cc

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

commit 2a4f41aae88d4ceea7bf98cd95615c679147c90e
Author: patricialor <patricialor@chromium.org>
Date: Wed Mar 08 02:52:56 2017

Views/Permissions: Update desktop UI to display BLOCK for embargoed permissions.

Update the website settings popup (the OIB) to show the appropriate 'block' text
when an permission is in embargo. For permissions embargoed because a kill
switch is turned on via Finch, prevent the user from being able to manually
allow this permission.

Note that while this currently doesn't work for media permissions, that will
change once they have been refactored to run through PermissionsManager.
See https://crbug.com/689799.

BUG= 679877 

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

[modify] https://crrev.com/2a4f41aae88d4ceea7bf98cd95615c679147c90e/chrome/browser/permissions/permission_util.cc
[modify] https://crrev.com/2a4f41aae88d4ceea7bf98cd95615c679147c90e/chrome/browser/permissions/permission_util.h
[modify] https://crrev.com/2a4f41aae88d4ceea7bf98cd95615c679147c90e/chrome/browser/ui/website_settings/website_settings.cc

 Issue 610528  has been merged into this issue.

Editing title so that this is easier to search for.

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

commit 217bb29f809ae73e537ec9c0eba5ac65f48fd873
Author: patricialor <patricialor@chromium.org>
Date: Wed Apr 05 02:28:10 2017

Permissions: Show the reason for permission decisions made on the user's behalf.

A decision for a permission may be allowed or blocked on behalf of the user,
either from one of the user's installed extensions, enforced by an enterprise
policy, or via embargo. Currently, the former two reasons (extensions or policy)
will be indicated to the user by custom strings in the menubutton or combobox
associated with that permission in the website settings pop-up.

This patch will put the reason for a permission decision being made underneath
a permission in gray text and add strings to tell if the permission was blocked
because of embargo for Views and Cocoa (Mac). See
https://docs.google.com/document/d/1TaoszQOgqhoxZkV1zAHDapam-LIOxGBIUfqU6npoPWs/edit?usp=sharing
for the relevant document and screenshots.

BUG= 679877 
TEST=For the embargo string: Run Chrome with the command line flag
--enable-features=BlockPromptsIfDismissedOften. Navigate to
https://permission.site. Click the "Notifications" button and press escape, and
repeat this three times in a row until the permission prompt no longer appears.
Opening the page info bubble should show the text "Automatically blocked"
underneath the "Notification" permission.
For the extensions string: Run Chrome and install the "Toggle Javascript"
extension. Click on the icon to enable it, then open page info. Underneath
Javascript, it should say "Controlled by an extension".
For the policy string: No easy way to test this cross-platform.

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

[modify] https://crrev.com/217bb29f809ae73e537ec9c0eba5ac65f48fd873/chrome/app/generated_resources.grd
[modify] https://crrev.com/217bb29f809ae73e537ec9c0eba5ac65f48fd873/chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.mm
[modify] https://crrev.com/217bb29f809ae73e537ec9c0eba5ac65f48fd873/chrome/browser/ui/cocoa/page_info/page_info_bubble_controller_unittest.mm
[modify] https://crrev.com/217bb29f809ae73e537ec9c0eba5ac65f48fd873/chrome/browser/ui/page_info/page_info_ui.cc
[modify] https://crrev.com/217bb29f809ae73e537ec9c0eba5ac65f48fd873/chrome/browser/ui/page_info/page_info_ui.h
[modify] https://crrev.com/217bb29f809ae73e537ec9c0eba5ac65f48fd873/chrome/browser/ui/views/page_info/permission_selector_row.cc

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

commit b7c5f428d57f3cc842a5838f2da34c05436bb244
Author: patricialor <patricialor@chromium.org>
Date: Wed Apr 19 04:21:45 2017

Permissions: Customize permission decision strings to ask/allow/block settings.

Follow up to r461944, which added permission decision strings for permission
decisions made by enterprise policy, extensions, or embargo. This change adds
custom permission decision strings clearer for each 'Ask'/'Allow'/'Block'
setting where previously, there was only one string for each setting source
(i.e., policy, extension, embargo).

See
https://docs.google.com/document/d/1TaoszQOgqhoxZkV1zAHDapam-LIOxGBIUfqU6npoPWs/edit?usp=sharing
for the relevant document and screenshots.

BUG= 679877 

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

[modify] https://crrev.com/b7c5f428d57f3cc842a5838f2da34c05436bb244/chrome/app/generated_resources.grd
[modify] https://crrev.com/b7c5f428d57f3cc842a5838f2da34c05436bb244/chrome/browser/ui/page_info/page_info_ui.cc
[modify] https://crrev.com/b7c5f428d57f3cc842a5838f2da34c05436bb244/components/page_info_strings.grdp
[modify] https://crrev.com/b7c5f428d57f3cc842a5838f2da34c05436bb244/tools/gritsettings/resource_ids

Implementation work is done and we're just awaiting launch review for M59