| Index: components/policy/core/common/cloud/user_cloud_policy_manager.cc
|
| diff --git a/components/policy/core/common/cloud/user_cloud_policy_manager.cc b/components/policy/core/common/cloud/user_cloud_policy_manager.cc
|
| index 2114ddee9d894300dcd2d934a1c12e66c0acf63a..cf68675075eda63817281a0532829bafc39765b3 100644
|
| --- a/components/policy/core/common/cloud/user_cloud_policy_manager.cc
|
| +++ b/components/policy/core/common/cloud/user_cloud_policy_manager.cc
|
| @@ -38,8 +38,7 @@
|
| io_task_runner),
|
| store_(std::move(store)),
|
| component_policy_cache_path_(component_policy_cache_path),
|
| - external_data_manager_(std::move(external_data_manager)),
|
| - chrome_home_enabled_(false) {}
|
| + external_data_manager_(std::move(external_data_manager)) {}
|
|
|
| UserCloudPolicyManager::~UserCloudPolicyManager() {}
|
|
|
| @@ -107,13 +106,8 @@
|
| // given that this is an enterprise user.
|
| // TODO(treib,atwilson): We should just call SetEnterpriseUsersDefaults here,
|
| // see crbug.com/640950.
|
| - // Temporary hack: If Chrome Home is enabled, then do not set the default
|
| - // value for the NTPContentSuggestionsEnabled policy, so that dogfooders
|
| - // won't see an almost-empty Chrome Home.
|
| - // TODO(treib): Remove this before M59 branch point. crbug.com/708191
|
| if (store()->has_policy() &&
|
| - !policy_map->Get(key::kNTPContentSuggestionsEnabled) &&
|
| - !chrome_home_enabled_) {
|
| + !policy_map->Get(key::kNTPContentSuggestionsEnabled)) {
|
| policy_map->Set(key::kNTPContentSuggestionsEnabled, POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
|
| base::MakeUnique<base::Value>(false),
|
|
|