Disable NTP Content Suggestions by default for enterprise users

chrome/browser/policy/cloud/cloud_policy_browsertest.cc

Index: chrome/browser/policy/cloud/cloud_policy_browsertest.cc
diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
index fa47b2b9a30be4c026a1359dffc12f813f6119a2..50d38c6a23306e0dfeddaf2433db96de39b9c2fc 100644
--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
@@ -149,6 +149,9 @@ std::string GetTestPolicy(const char* homepage, int key_version) {
 }
 
 void GetExpectedDefaultPolicy(PolicyMap* policy_map) {
+  policy_map->Set(key::kNTPContentSuggestionsEnabled, POLICY_LEVEL_MANDATORY,
+                  POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
+                  base::WrapUnique(new base::FundamentalValue(false)), nullptr);
 #if defined(OS_CHROMEOS)
   policy_map->Set(
       key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY,
@@ -191,6 +194,10 @@ void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
   expected->Set(key::kHomepageLocation, POLICY_LEVEL_RECOMMENDED,
                 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
                 base::WrapUnique(new base::StringValue(homepage)), nullptr);
+
+  expected->Set(key::kNTPContentSuggestionsEnabled, POLICY_LEVEL_MANDATORY,

[Marc Treib, 2016/08/26 13:13:37]

From here on, the rest of this function exactly duplicates
GetExpectedDefaultPolicy, so maybe we should just call that instead - WDYT?

[Andrew T Wilson (Slow), 2016/08/26 14:08:05]

Yes, please make that change if you don't mind! Or OK to land without it, your
call.

[Marc Treib, 2016/08/26 14:12:11]

Done.

+                POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
+                base::WrapUnique(new base::FundamentalValue(false)), nullptr);
 #if defined(OS_CHROMEOS)
   expected->Set(key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY,
                 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,