Revert of Don't set a default value for the NTPContentSuggestionsEnabled policy if ChromeHome is enabled

chrome/browser/policy/cloud/user_cloud_policy_manager_factory.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 "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/policy/schema_registry_service.h"
 #include "chrome/browser/policy/schema_registry_service_factory.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/policy/core/common/cloud/cloud_external_data_manager.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
 #include "components/policy/core/common/cloud/user_cloud_policy_store.h"
 #include "content/public/browser/browser_context.h"
 
-#if defined(OS_ANDROID)
-#include "chrome/browser/android/chrome_feature_list.h"
-#endif
-
 namespace policy {
 
 namespace {
 
 // Directory inside the profile directory where policy-related resources are
 // stored.
 const base::FilePath::CharType kPolicy[] = FILE_PATH_LITERAL("Policy");
 
 // Directory under kPolicy, in the user's profile dir, where policy for
 // components is cached.
@@ skipping 110 matching lines @@
   DCHECK(!testing_factory_);
 
   std::unique_ptr<UserCloudPolicyStore> store(
       UserCloudPolicyStore::Create(context->GetPath(), background_task_runner));
   if (force_immediate_load)
     store->LoadImmediately();
 
   const base::FilePath component_policy_cache_dir =
       context->GetPath().Append(kPolicy).Append(kComponentsDir);
 
-  auto manager = base::MakeUnique<UserCloudPolicyManager>(
+  std::unique_ptr<UserCloudPolicyManager> manager;
+  manager.reset(new UserCloudPolicyManager(
       std::move(store), component_policy_cache_dir,
       std::unique_ptr<CloudExternalDataManager>(),
-      base::ThreadTaskRunnerHandle::Get(), file_task_runner, io_task_runner);
-
-#if defined(OS_ANDROID)
-  // TODO(treib): Remove this again. crbug.com/708191
-  if (base::FeatureList::IsEnabled(chrome::android::kChromeHomeFeature))
-    manager->SetChromeHomeEnabled();
-#endif
+      base::ThreadTaskRunnerHandle::Get(), file_task_runner, io_task_runner));
   manager->Init(
       SchemaRegistryServiceFactory::GetForContext(context)->registry());
   manager_wrappers_[context] = new ManagerWrapper(manager.get());
   return manager;
 }
 
 UserCloudPolicyManager*
 UserCloudPolicyManagerFactory::RegisterManagerForOffTheRecordBrowserContext(
     content::BrowserContext* original_context,
     content::BrowserContext* off_the_record_context) {
@@ skipping 39 matching lines @@
   return testing_factory_ != NULL;
 }
 
 void UserCloudPolicyManagerFactory::CreateServiceNow(
     content::BrowserContext* context) {
   DCHECK(testing_factory_);
   manager_wrappers_[context] = new ManagerWrapper(testing_factory_(context));
 }
 
 }  // namespace policy