[invalidation] Componentize TiclProfileSettingsProvider

chrome/browser/invalidation/profile_invalidation_provider_factory.cc

Index: chrome/browser/invalidation/profile_invalidation_provider_factory.cc
diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
index 4cf515c152023694b68879da95202962ec9c1323..e41c7e0b0a32768282b8f4766137fecf899ed083 100644
--- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
+++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
@@ -7,7 +7,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_registry.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/invalidation/ticl_profile_settings_provider.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
@@ -15,11 +14,12 @@
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/chrome_content_client.h"
-#include "chrome/common/pref_names.h"
+#include "components/invalidation/impl/invalidation_prefs.h"
 #include "components/invalidation/impl/invalidation_state_tracker.h"
 #include "components/invalidation/impl/invalidator_storage.h"
 #include "components/invalidation/impl/profile_invalidation_provider.h"
 #include "components/invalidation/impl/ticl_invalidation_service.h"
+#include "components/invalidation/impl/ticl_profile_settings_provider.h"
 #include "components/invalidation/impl/ticl_settings_provider.h"
 #include "components/invalidation/public/invalidation_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
@@ -124,10 +124,9 @@ KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(
   }
 
   scoped_ptr<TiclInvalidationService> service(new TiclInvalidationService(
-      GetUserAgent(),
-      identity_provider.Pass(),
+      GetUserAgent(), identity_provider.Pass(),
       scoped_ptr<TiclSettingsProvider>(
-          new TiclProfileSettingsProvider(profile)),
+          new TiclProfileSettingsProvider(profile->GetPrefs())),
       gcm::GCMProfileServiceFactory::GetForProfile(profile)->driver(),
       profile->GetRequestContext()));
   service->Init(scoped_ptr<syncer::InvalidationStateTracker>(
@@ -139,9 +138,7 @@ KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(
 
 void ProfileInvalidationProviderFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
-  registry->RegisterBooleanPref(
-      prefs::kInvalidationServiceUseGCMChannel,
-      true);  // if no value in prefs, use GCM channel.
+  ProfileInvalidationProvider::RegisterProfilePrefs(registry);
   InvalidatorStorage::RegisterProfilePrefs(registry);
 }