New issue
Advanced search Search tips
Note: Color blocks (like █ or █) mean that a user may not be available. Tooltip shows the reason.

Issue 590478 link

Starred by 2 users
Status: Fixed
Owner:
ljusten@chromium.org
Closed: Oct 2016
Cc:
atwilson@chromium.org
█ brajkumar@chromium.org
maxkirsch@chromium.org
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 2
Type: Feature



Sign in to add a comment

Update YouTube Restricted Mode behavior

Project Member Reported by maxkirsch@chromium.org, Feb 27 2016

Comment 1 by dskaram@chromium.org, Mar 2 2016

Owner: maxkirsch@chromium.org

Comment 2 by atwilson@chromium.org, Mar 29 2016

Labels: Hotlist-GoodFirstBug
Owner: atwilson@chromium.org

Comment 3 by a.obzhirov@samsung.com, Jun 2 2016 

Hi guys, I am interested to work on this issue but I cannot access 
https://docs.google.com/document/d/1HlxYVM0SLs5gkCiZNyMRD_SWbdpEtJRTeBoEtTmfCRY/edit
to understand the details :) Is it possible to open the link?

Comment 4 by maxkirsch@chromium.org, Jun 7 2016 

atwilson@ - Could I assign to Márton?  Anyone else with cycles to take this one? Should be a small fix

Comment 5 by atwilson@chromium.org, Jun 7 2016 

I have someone joining in July, let's give them this as a starter bug.

Comment 6 by atwilson@chromium.org, Jul 7 2016

Cc: ljusten@chromium.org

Comment 7 by atwilson@chromium.org, Jul 7 2016

Cc: -ljusten@chromium.org atwilson@chromium.org
Owner: ljusten@chromium.org

Comment 8 by ljusten@chromium.org, Jul 14 2016

Status: Started (was: Available)

Comment 9 by tnagel@chromium.org, Aug 12 2016 

Max, since you seem to be the PM owner, could you please confirm that the YouTube-Restrict header is fully implemented and rolled out on the YT side?

Comment 11 by maxkirsch@chromium.org, Aug 23 2016 

Lutz, can you take a look at this when you get a chance?  We should really get this into a Chrome milestone ASAP since the new settings have been around for a while now.

Comment 12 by ljusten@chromium.org, Sep 5 2016 

Max, the changes are implemented and being reviewed. I'm hoping to land it this week. See https://codereview.chromium.org/2239753002/.
Project Member

Comment 13 by bugdroid1@chromium.org, Oct 6 2016 

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

commit c42c0dddcb3c630cb30096d16a4485bd1025eccc
Author: ljusten <ljusten@chromium.org>
Date: Thu Oct 06 17:31:01 2016

Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy

ForceYouTubeRestrict allows 3 settings: off/moderate/strict.
ForceYouTubeSafetyMode only allowed off/on.
If ForceYouTubeRestrict is set, ForceYouTubeSafetyMode is ignored.
If ForceYouTubeRestrict is not set and ForceYouTubeSafetyMode is set, 'on' is mapped to 'moderate'.
If the deprecated ForceSafeSearch policy is set and neither ForceYouTubeSafetyMode nor
ForceYouTubeRestrict are set, 'on' is mapped to 'moderate' as well.
The restrict mode is sent to YouTube by adding a "YouTube-Restrict" HTML request header
with values "Moderate" resp. "Strict". The old "YouTube-Safety-Mode" is no longer sent,
even if ForceYouTubeRestrict is not set. YouTube already properly interprets
"YouTube-Restrict".

BUG= 590478 

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

[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/net/safe_search_util.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/net/safe_search_util.h
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/net/safe_search_util_unittest.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/policy/configuration_policy_handler_list_factory.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/policy/policy_browsertest.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/profiles/profile_impl.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/profiles/profile_io_data.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/profiles/profile_io_data.h
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/supervised_user/supervised_user_pref_store.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/common/pref_names.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/common/pref_names.h
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/test/data/policy/policy_test_cases.json
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/components/policy/resources/policy_templates.json
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/tools/metrics/histograms/histograms.xml
Project Member

Comment 14 by bugdroid1@chromium.org, Oct 6 2016 

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

commit e0272627e60748462851aae327c242599066b80e
Author: Nasko Oskov <nasko@chromium.org>
Date: Thu Oct 06 19:51:55 2016

Revert "Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy"

This reverts commit c42c0dddcb3c630cb30096d16a4485bd1025eccc.

Reason:
The PolicyTest.ForceSafeSearch test is failing on Windows bots.
https://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/53375

TBR=ljusten@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 590478 

Review URL: https://codereview.chromium.org/2401733002 .

Cr-Commit-Position: refs/heads/master@{#423637}

[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/net/safe_search_util.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/net/safe_search_util.h
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/net/safe_search_util_unittest.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/policy/configuration_policy_handler_list_factory.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/policy/policy_browsertest.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/profiles/profile_impl.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/profiles/profile_io_data.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/profiles/profile_io_data.h
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/supervised_user/supervised_user_pref_store.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/common/pref_names.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/common/pref_names.h
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/test/data/policy/policy_test_cases.json
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/components/policy/resources/policy_templates.json
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/tools/metrics/histograms/histograms.xml
Project Member

Comment 15 by bugdroid1@chromium.org, Oct 11 2016 

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

commit 98684cb7910faea91679c00a54484237e386a099
Author: ljusten <ljusten@chromium.org>
Date: Tue Oct 11 13:26:18 2016

Recommit and fix of "Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy"
Git hash: c42c0dddcb3c630cb30096d16a4485bd1025eccc
Link: https://codereview.chromium.org/2239753002/

The CL was reverted because of a timeout in the PolicyTest.ForceSafeSearch browser test. The test was doing a lot of calls to the slow CheckSafeSearch function. To fix this, the browser test is split into two separate tests:
LegacySafeSearch verifies that prefs are set properly.
ForceGoogleSafeSearch verifies that safe search actually is in effect depending on the pref.

TBR=tnagel@chromium.org
BUG= 590478 

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

[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/browser/net/safe_search_util.cc
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/browser/net/safe_search_util.h
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/browser/net/safe_search_util_unittest.cc
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/browser/policy/configuration_policy_handler_list_factory.cc
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/browser/policy/policy_browsertest.cc
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/browser/profiles/profile_impl.cc
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/browser/profiles/profile_io_data.cc
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/browser/profiles/profile_io_data.h
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/browser/supervised_user/supervised_user_pref_store.cc
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/common/pref_names.cc
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/common/pref_names.h
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/chrome/test/data/policy/policy_test_cases.json
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/components/policy/resources/policy_templates.json
[modify] https://crrev.com/98684cb7910faea91679c00a54484237e386a099/tools/metrics/histograms/histograms.xml

Comment 16 by ljusten@chromium.org, Oct 14 2016

Labels: Merge-Request-55
Status: Fixed (was: Started)

Comment 17 by dimu@chromium.org, Oct 14 2016

Labels: -Merge-Request-55 Merge-Approved-55 Hotlist-Merge-Approved
Your change meets the bar and is auto-approved for M55 (branch: 2883)
Project Member

Comment 18 by bugdroid1@chromium.org, Oct 14 2016

Labels: -merge-approved-55 merge-merged-2883
The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/8fa312f6c8be200caf342c8cb26f7e638b62b5a5

commit 8fa312f6c8be200caf342c8cb26f7e638b62b5a5
Author: Thiemo Nagel <tnagel@chromium.org>
Date: Fri Oct 14 12:18:42 2016

Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy

ForceYouTubeRestrict allows 3 settings: off/moderate/strict.
ForceYouTubeSafetyMode only allowed off/on.
If ForceYouTubeRestrict is set, ForceYouTubeSafetyMode is ignored.
If ForceYouTubeRestrict is not set and ForceYouTubeSafetyMode is set, 'on' is mapped to 'moderate'.
If the deprecated ForceSafeSearch policy is set and neither ForceYouTubeSafetyMode nor
ForceYouTubeRestrict are set, 'on' is mapped to 'moderate' as well.
The restrict mode is sent to YouTube by adding a "YouTube-Restrict" HTML request header
with values "Moderate" resp. "Strict". The old "YouTube-Safety-Mode" is no longer sent,
even if ForceYouTubeRestrict is not set. YouTube already properly interprets
"YouTube-Restrict".

BUG= 590478 

Review-Url: https://codereview.chromium.org/2239753002
Cr-Commit-Position: refs/heads/master@{#423571}
(cherry picked from commit c42c0dddcb3c630cb30096d16a4485bd1025eccc)

Review URL: https://codereview.chromium.org/2415423002 .

Cr-Commit-Position: refs/branch-heads/2883@{#105}
Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}

[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/net/safe_search_util.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/net/safe_search_util.h
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/net/safe_search_util_unittest.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/policy/configuration_policy_handler_list_factory.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/policy/policy_browsertest.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/profiles/profile_impl.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/profiles/profile_io_data.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/profiles/profile_io_data.h
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/supervised_user/supervised_user_pref_store.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/common/pref_names.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/common/pref_names.h
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/test/data/policy/policy_test_cases.json
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/components/policy/resources/policy_templates.json
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/tools/metrics/histograms/histograms.xml
Project Member

Comment 19 by bugdroid1@chromium.org, Oct 17 2016 

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

commit e72469fc30e61ad4fefb5133707637ab82c57a8e
Author: Thiemo Nagel <tnagel@chromium.org>
Date: Mon Oct 17 09:46:05 2016

Revert "Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy"

This reverts commit c42c0dddcb3c630cb30096d16a4485bd1025eccc.

Reason:
The PolicyTest.ForceSafeSearch test is failing on Windows bots.
https://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/53375

TBR=ljusten@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 590478 

Review URL: https://codereview.chromium.org/2401733002 .

Cr-Commit-Position: refs/heads/master@{#423637}
(cherry picked from commit e0272627e60748462851aae327c242599066b80e)

Review URL: https://codereview.chromium.org/2419383004 .

Cr-Commit-Position: refs/branch-heads/2883@{#140}
Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}

[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/net/safe_search_util.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/net/safe_search_util.h
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/net/safe_search_util_unittest.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/policy/configuration_policy_handler_list_factory.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/policy/policy_browsertest.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/profiles/profile_impl.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/profiles/profile_io_data.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/profiles/profile_io_data.h
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/supervised_user/supervised_user_pref_store.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/common/pref_names.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/common/pref_names.h
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/test/data/policy/policy_test_cases.json
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/components/policy/resources/policy_templates.json
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/tools/metrics/histograms/histograms.xml
Project Member

Comment 20 by bugdroid1@chromium.org, Oct 17 2016 

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

commit 1b41012bd35759a41215252a5befa12fc2add45f
Author: Thiemo Nagel <tnagel@chromium.org>
Date: Mon Oct 17 09:51:45 2016

Recommit and fix of "Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy" Git hash: c42c0dddcb3c630cb30096d16a4485bd1025eccc Link: https://codereview.chromium.org/2239753002/

The CL was reverted because of a timeout in the PolicyTest.ForceSafeSearch browser test. The test was doing a lot of calls to the slow CheckSafeSearch function. To fix this, the browser test is split into two separate tests:
LegacySafeSearch verifies that prefs are set properly.
ForceGoogleSafeSearch verifies that safe search actually is in effect depending on the pref.

TBR=tnagel@chromium.org
BUG= 590478 

Review-Url: https://codereview.chromium.org/2401743003
Cr-Commit-Position: refs/heads/master@{#424413}
(cherry picked from commit 98684cb7910faea91679c00a54484237e386a099)

Review URL: https://codereview.chromium.org/2421233002 .

Cr-Commit-Position: refs/branch-heads/2883@{#141}
Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}

[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/net/safe_search_util.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/net/safe_search_util.h
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/net/safe_search_util_unittest.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/policy/configuration_policy_handler_list_factory.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/policy/policy_browsertest.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/profiles/profile_impl.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/profiles/profile_io_data.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/profiles/profile_io_data.h
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/supervised_user/supervised_user_pref_store.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/common/pref_names.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/common/pref_names.h
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/test/data/policy/policy_test_cases.json
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/components/policy/resources/policy_templates.json
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/tools/metrics/histograms/histograms.xml

Comment 21 by tnagel@chromium.org, Oct 17 2016 

Since I had initially drovered the wrong commit, I followed up with drovering the revert and then drovering the fixed re-commit.

Comment 22 by brajkumar@chromium.org, Oct 18 2016

Cc: brajkumar@chromium.org
Labels: Needs-Feedback
ljusten@ - Could you please let us know is there any sample repro steps available to verify this issue from Chrome-TE end?

Comment 23 by ljusten@chromium.org, Oct 18 2016 

Yes. ForceYouTubeRestrict should have influence on what videos you can watch on YouTube. If you set the policy ForceYouTubeRestrict to 0 (e.g. on Linux: As root, add a file 'test.json' containing
{
  "ForceYouTubeRestrict": 0
}
to /etc/opt/chrome/policies/managed), you should be able to watch all movies, unless YouTube itself has restricted mode enabled (somewhere at the bottom of the YouTube page).
If you set ForceYouTubeRestrict to 1, you should not be able to watch e.g. 
https://www.youtube.com/watch?v=RO90omga8D4, but still
https://www.youtube.com/watch?v=S-UPJyEHmM0
If you set ForceYouTubeRestrict to 2, you should not be able to watch both of the above movies, but still e.g.
https://www.youtube.com/watch?v=agi4geKb8v8.

Video / ForceYouTubeRestrict                 0   1   2
https://www.youtube.com/watch?v=RO90omga8D4  Yes No  No
https://www.youtube.com/watch?v=S-UPJyEHmM0  Yes Yes No
https://www.youtube.com/watch?v=agi4geKb8v8  Yes Yes Yes

Comment 24 by pbomm...@chromium.org, Oct 18 2016 

Thank you ljusten@ for the verifcation steps, I have verified the Cl on Linux(ubuntu 14.04Lts) with chrome version 55.0.2883.19 :

I have followed the steps provided in comment#23 and pretty much all the results were as specified by  ljusten@ except when I set 

{
  "ForceYouTubeRestrict": 2 
}

in my case all three videos which are mentioned above are getting blocked, where in tried playing couple of other videos on youtube and they work fine. Please find the test results from my verification below :

Video / ForceYouTubeRestrict                 0   1   2
https://www.youtube.com/watch?v=RO90omga8D4  Yes No  No
https://www.youtube.com/watch?v=S-UPJyEHmM0  Yes Yes No
https://www.youtube.com/watch?v=agi4geKb8v8  Yes Yes No

Comment 25 by ljusten@chromium.org, Oct 19 2016 

Same for me, apparently someone gave a cat video a moderately restricted rating... Replacing 
https://www.youtube.com/watch?v=agi4geKb8v8 
by
https://www.youtube.com/watch?v=-Vt2JzdPqjU
should do the trick.
Project Member

Comment 26 by bugdroid1@chromium.org, Oct 27 2016

Labels: merge-merged-2840
The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/c42c0dddcb3c630cb30096d16a4485bd1025eccc

commit c42c0dddcb3c630cb30096d16a4485bd1025eccc
Author: ljusten <ljusten@chromium.org>
Date: Thu Oct 06 17:31:01 2016

Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy

ForceYouTubeRestrict allows 3 settings: off/moderate/strict.
ForceYouTubeSafetyMode only allowed off/on.
If ForceYouTubeRestrict is set, ForceYouTubeSafetyMode is ignored.
If ForceYouTubeRestrict is not set and ForceYouTubeSafetyMode is set, 'on' is mapped to 'moderate'.
If the deprecated ForceSafeSearch policy is set and neither ForceYouTubeSafetyMode nor
ForceYouTubeRestrict are set, 'on' is mapped to 'moderate' as well.
The restrict mode is sent to YouTube by adding a "YouTube-Restrict" HTML request header
with values "Moderate" resp. "Strict". The old "YouTube-Safety-Mode" is no longer sent,
even if ForceYouTubeRestrict is not set. YouTube already properly interprets
"YouTube-Restrict".

BUG= 590478 

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

[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/net/safe_search_util.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/net/safe_search_util.h
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/net/safe_search_util_unittest.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/policy/configuration_policy_handler_list_factory.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/policy/policy_browsertest.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/profiles/profile_impl.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/profiles/profile_io_data.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/profiles/profile_io_data.h
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/supervised_user/supervised_user_pref_store.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/common/pref_names.cc
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/common/pref_names.h
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/chrome/test/data/policy/policy_test_cases.json
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/components/policy/resources/policy_templates.json
[modify] https://crrev.com/c42c0dddcb3c630cb30096d16a4485bd1025eccc/tools/metrics/histograms/histograms.xml
Project Member

Comment 27 by bugdroid1@chromium.org, Oct 27 2016 

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

commit e0272627e60748462851aae327c242599066b80e
Author: Nasko Oskov <nasko@chromium.org>
Date: Thu Oct 06 19:51:55 2016

Revert "Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy"

This reverts commit c42c0dddcb3c630cb30096d16a4485bd1025eccc.

Reason:
The PolicyTest.ForceSafeSearch test is failing on Windows bots.
https://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/53375

TBR=ljusten@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 590478 

Review URL: https://codereview.chromium.org/2401733002 .

Cr-Commit-Position: refs/heads/master@{#423637}

[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/net/safe_search_util.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/net/safe_search_util.h
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/net/safe_search_util_unittest.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/policy/configuration_policy_handler_list_factory.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/policy/policy_browsertest.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/profiles/profile_impl.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/profiles/profile_io_data.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/profiles/profile_io_data.h
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/supervised_user/supervised_user_pref_store.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/common/pref_names.cc
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/common/pref_names.h
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/chrome/test/data/policy/policy_test_cases.json
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/components/policy/resources/policy_templates.json
[modify] https://crrev.com/e0272627e60748462851aae327c242599066b80e/tools/metrics/histograms/histograms.xml
Project Member

Comment 28 by bugdroid1@chromium.org, Oct 27 2016 

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

commit 8fa312f6c8be200caf342c8cb26f7e638b62b5a5
Author: Thiemo Nagel <tnagel@chromium.org>
Date: Fri Oct 14 12:18:42 2016

Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy

ForceYouTubeRestrict allows 3 settings: off/moderate/strict.
ForceYouTubeSafetyMode only allowed off/on.
If ForceYouTubeRestrict is set, ForceYouTubeSafetyMode is ignored.
If ForceYouTubeRestrict is not set and ForceYouTubeSafetyMode is set, 'on' is mapped to 'moderate'.
If the deprecated ForceSafeSearch policy is set and neither ForceYouTubeSafetyMode nor
ForceYouTubeRestrict are set, 'on' is mapped to 'moderate' as well.
The restrict mode is sent to YouTube by adding a "YouTube-Restrict" HTML request header
with values "Moderate" resp. "Strict". The old "YouTube-Safety-Mode" is no longer sent,
even if ForceYouTubeRestrict is not set. YouTube already properly interprets
"YouTube-Restrict".

BUG= 590478 

Review-Url: https://codereview.chromium.org/2239753002
Cr-Commit-Position: refs/heads/master@{#423571}
(cherry picked from commit c42c0dddcb3c630cb30096d16a4485bd1025eccc)

Review URL: https://codereview.chromium.org/2415423002 .

Cr-Commit-Position: refs/branch-heads/2883@{#105}
Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}

[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/net/safe_search_util.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/net/safe_search_util.h
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/net/safe_search_util_unittest.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/policy/configuration_policy_handler_list_factory.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/policy/policy_browsertest.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/profiles/profile_impl.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/profiles/profile_io_data.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/profiles/profile_io_data.h
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/supervised_user/supervised_user_pref_store.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/common/pref_names.cc
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/common/pref_names.h
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/chrome/test/data/policy/policy_test_cases.json
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/components/policy/resources/policy_templates.json
[modify] https://crrev.com/8fa312f6c8be200caf342c8cb26f7e638b62b5a5/tools/metrics/histograms/histograms.xml
Project Member

Comment 29 by bugdroid1@chromium.org, Oct 27 2016 

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

commit e72469fc30e61ad4fefb5133707637ab82c57a8e
Author: Thiemo Nagel <tnagel@chromium.org>
Date: Mon Oct 17 09:46:05 2016

Revert "Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy"

This reverts commit c42c0dddcb3c630cb30096d16a4485bd1025eccc.

Reason:
The PolicyTest.ForceSafeSearch test is failing on Windows bots.
https://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/53375

TBR=ljusten@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 590478 

Review URL: https://codereview.chromium.org/2401733002 .

Cr-Commit-Position: refs/heads/master@{#423637}
(cherry picked from commit e0272627e60748462851aae327c242599066b80e)

Review URL: https://codereview.chromium.org/2419383004 .

Cr-Commit-Position: refs/branch-heads/2883@{#140}
Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}

[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/net/safe_search_util.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/net/safe_search_util.h
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/net/safe_search_util_unittest.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/policy/configuration_policy_handler_list_factory.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/policy/policy_browsertest.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/profiles/profile_impl.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/profiles/profile_io_data.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/profiles/profile_io_data.h
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/supervised_user/supervised_user_pref_store.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/common/pref_names.cc
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/common/pref_names.h
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/chrome/test/data/policy/policy_test_cases.json
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/components/policy/resources/policy_templates.json
[modify] https://crrev.com/e72469fc30e61ad4fefb5133707637ab82c57a8e/tools/metrics/histograms/histograms.xml
Project Member

Comment 30 by bugdroid1@chromium.org, Oct 27 2016 

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

commit 1b41012bd35759a41215252a5befa12fc2add45f
Author: Thiemo Nagel <tnagel@chromium.org>
Date: Mon Oct 17 09:51:45 2016

Recommit and fix of "Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy" Git hash: c42c0dddcb3c630cb30096d16a4485bd1025eccc Link: https://codereview.chromium.org/2239753002/

The CL was reverted because of a timeout in the PolicyTest.ForceSafeSearch browser test. The test was doing a lot of calls to the slow CheckSafeSearch function. To fix this, the browser test is split into two separate tests:
LegacySafeSearch verifies that prefs are set properly.
ForceGoogleSafeSearch verifies that safe search actually is in effect depending on the pref.

TBR=tnagel@chromium.org
BUG= 590478 

Review-Url: https://codereview.chromium.org/2401743003
Cr-Commit-Position: refs/heads/master@{#424413}
(cherry picked from commit 98684cb7910faea91679c00a54484237e386a099)

Review URL: https://codereview.chromium.org/2421233002 .

Cr-Commit-Position: refs/branch-heads/2883@{#141}
Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}

[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/net/safe_search_util.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/net/safe_search_util.h
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/net/safe_search_util_unittest.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/policy/configuration_policy_handler_list_factory.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/policy/policy_browsertest.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/profiles/profile_impl.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/profiles/profile_io_data.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/profiles/profile_io_data.h
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/supervised_user/supervised_user_pref_store.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/common/pref_names.cc
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/common/pref_names.h
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/chrome/test/data/policy/policy_test_cases.json
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/components/policy/resources/policy_templates.json
[modify] https://crrev.com/1b41012bd35759a41215252a5befa12fc2add45f/tools/metrics/histograms/histograms.xml

Comment 31 by dimu@google.com, Nov 4 2016

Labels: -merge-merged-2840
[Automated comment] removing mislabelled merge-merged-2840
►

Sign in to add a comment