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

commit 80618c346d3f78823fe6061349319a98a867b6cf
Author: estark <estark@chromium.org>
Date: Wed May 24 02:48:31 2017

Add enterprise policy for network time service

The NetworkTimeQueriesEnabled policy, if set to false, will disable
NetworkTimeTracker's queries to Google to fetch an accurate timestamp.

NetworkTimeTracker uses these to decide when to prompt the user to fix their
clock if they encounter a certificate date error.

BUG= 725232 

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

[modify] https://crrev.com/80618c346d3f78823fe6061349319a98a867b6cf/chrome/browser/policy/configuration_policy_handler_list_factory.cc
[modify] https://crrev.com/80618c346d3f78823fe6061349319a98a867b6cf/chrome/browser/policy/policy_browsertest.cc
[modify] https://crrev.com/80618c346d3f78823fe6061349319a98a867b6cf/chrome/test/data/policy/policy_test_cases.json
[modify] https://crrev.com/80618c346d3f78823fe6061349319a98a867b6cf/components/network_time/network_time_pref_names.cc
[modify] https://crrev.com/80618c346d3f78823fe6061349319a98a867b6cf/components/network_time/network_time_pref_names.h
[modify] https://crrev.com/80618c346d3f78823fe6061349319a98a867b6cf/components/network_time/network_time_tracker.cc
[modify] https://crrev.com/80618c346d3f78823fe6061349319a98a867b6cf/components/policy/resources/policy_templates.json
[modify] https://crrev.com/80618c346d3f78823fe6061349319a98a867b6cf/tools/metrics/histograms/enums.xml

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

commit 0445935b1f4740e0e283c3fcd5fa7760e9d517b7
Author: estark <estark@chromium.org>
Date: Wed May 24 18:07:05 2017

Set up Finch feature for network time policy browser test

This is a follow-up to https://codereview.chromium.org/2902603002/ where this
test was added but fails on official bots.

BUG= 725232 ,725847
TBR=pastarmovj@chromium.org

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

[modify] https://crrev.com/0445935b1f4740e0e283c3fcd5fa7760e9d517b7/chrome/browser/policy/policy_browsertest.cc

Asking kindly to address https://codereview.chromium.org/2902603002/#msg28 before closing this out.

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

commit 9a1fe807fa28e16fadca9032239233dcd092aace
Author: estark <estark@chromium.org>
Date: Thu Jun 01 15:50:17 2017

Rename network time policy to BrowserNetworkTimeQueriesEnabled

Per https://codereview.chromium.org/2902603002/#msg28, we are only going to
enable network time queries on non-ChromeOS desktop browsers.

BUG= 725232 

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

[modify] https://crrev.com/9a1fe807fa28e16fadca9032239233dcd092aace/chrome/browser/policy/configuration_policy_handler_list_factory.cc
[modify] https://crrev.com/9a1fe807fa28e16fadca9032239233dcd092aace/chrome/browser/policy/policy_browsertest.cc
[modify] https://crrev.com/9a1fe807fa28e16fadca9032239233dcd092aace/chrome/test/data/policy/policy_test_cases.json
[modify] https://crrev.com/9a1fe807fa28e16fadca9032239233dcd092aace/components/policy/resources/policy_templates.json

Requesting a merge to M60 for commit in comment 7

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

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

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

commit c027a45fe5931b5e86d632253673287b3f4582d4
Author: estark <estark@chromium.org>
Date: Fri Jun 02 17:28:16 2017

Update NetworkTimeQueries policy name in annotation

BUG= 725232 

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

[modify] https://crrev.com/c027a45fe5931b5e86d632253673287b3f4582d4/components/network_time/network_time_tracker.cc

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

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

I ended up deciding not to merge this. I forgot that there was a series of commits here rather than just one, and I think a merge is likely to get more complicated than it's worth.