[NTP Snippets] Add a pref to disable the NTPSnippetsService

chrome/browser/ntp_snippets/ntp_snippets_service_factory.cc

 // Copyright 2015 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/ntp_snippets/ntp_snippets_service_factory.h"
 
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/suggestions/image_decoder_impl.h"
 #include "chrome/browser/search/suggestions/suggestions_service_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/channel_info.h"
-#include "chrome/common/pref_names.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
 #include "components/image_fetcher/image_decoder.h"
 #include "components/image_fetcher/image_fetcher.h"
 #include "components/image_fetcher/image_fetcher_impl.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/ntp_snippets/content_suggestions_service.h"
 #include "components/ntp_snippets/ntp_snippets_constants.h"
 #include "components/ntp_snippets/ntp_snippets_database.h"
 #include "components/ntp_snippets/ntp_snippets_fetcher.h"
 #include "components/ntp_snippets/ntp_snippets_scheduler.h"
@@ skipping 51 matching lines @@
     content::BrowserContext* context) const {
   Profile* profile = Profile::FromBrowserContext(context);
 
   ContentSuggestionsService* content_suggestions_service =
       ContentSuggestionsServiceFactory::GetForProfile(profile);
   // TODO(pke): When the AndroidBridge does not access the NTPSnippetsService
   // directly anymore (for retrieving content), the NTPSnippetsService does not
   // need to be created if content_suggestions_service->state() == DISABLED,
   // just return nullptr then and remove the other "if" below.
 
-  // TODO(mvanouwerkerk): Move the enable logic into the service once we start
-  // observing pref changes.
   bool enabled = false;
 #if defined(OS_ANDROID)
-  enabled = profile->GetPrefs()->GetBoolean(prefs::kSearchSuggestEnabled) &&
-            base::FeatureList::IsEnabled(chrome::android::kNTPSnippetsFeature);
+  enabled = base::FeatureList::IsEnabled(chrome::android::kNTPSnippetsFeature);
 #endif  // OS_ANDROID
 
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(profile);
   OAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
   scoped_refptr<net::URLRequestContextGetter> request_context =
       content::BrowserContext::GetDefaultStoragePartition(context)->
             GetURLRequestContext();
   ProfileSyncService* sync_service =
@@ skipping 21 matching lines @@
           base::MakeUnique<ntp_snippets::NTPSnippetsFetcher>(
               signin_manager, token_service, request_context,
               base::Bind(&safe_json::SafeJsonParser::Parse),
               chrome::GetChannel() == version_info::Channel::STABLE),
           base::MakeUnique<ImageFetcherImpl>(
               base::MakeUnique<ImageDecoderImpl>(), request_context.get()),
           base::MakeUnique<ImageDecoderImpl>(),
           base::MakeUnique<ntp_snippets::NTPSnippetsDatabase>(database_dir,
                                                               task_runner),
           base::MakeUnique<ntp_snippets::NTPSnippetsStatusService>(
-              signin_manager, sync_service));
+              signin_manager, sync_service, profile->GetPrefs()));
 
   if (content_suggestions_service->state() ==
       ContentSuggestionsService::State::ENABLED) {
     content_suggestions_service->RegisterProvider(ntp_snippets_service);
   }
   return ntp_snippets_service;
 }