Disable NTP Content Suggestions by default for enterprise users

chrome/browser/policy/cloud/cloud_policy_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 131 matching lines @@
       "}";
 
   return base::StringPrintf(kTestPolicy,
                             dm_protocol::kChromeUserPolicyType,
                             homepage,
                             GetTestUser(),
                             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,
       POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
       base::WrapUnique(new base::StringValue("primary-only")), nullptr);
   policy_map->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY,
                   POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
                   base::WrapUnique(new base::FundamentalValue(false)), nullptr);
   policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
                   POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
@@ skipping 22 matching lines @@
   list.AppendString("dev.chromium.org");
   list.AppendString("youtube.com");
   expected->Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                 POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
   expected->Set(key::kMaxInvalidationFetchDelay, POLICY_LEVEL_MANDATORY,
                 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
                 base::WrapUnique(new base::FundamentalValue(1000)), nullptr);
   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,
                 base::WrapUnique(new base::StringValue("primary-only")),
                 nullptr);
   expected->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY,
                 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
                 base::WrapUnique(new base::FundamentalValue(false)), nullptr);
   expected->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
                 POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
@@ skipping 307 matching lines @@
 
   // They should now serialize to the same bytes.
   std::string chrome_settings_serialized;
   std::string cloud_policy_serialized;
   ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized));
   ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized));
   EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized);
 }
 
 }  // namespace policy