Remove Profile dependency from TiclInvalidationService

chrome/browser/invalidation/invalidation_service_factory.cc

Index: chrome/browser/invalidation/invalidation_service_factory.cc
diff --git a/chrome/browser/invalidation/invalidation_service_factory.cc b/chrome/browser/invalidation/invalidation_service_factory.cc
index 0b62bad48c5e4cd053dcdd474294f55602807fea..f6270811c878abfc2f803dff61e6494b4b686826 100644
--- a/chrome/browser/invalidation/invalidation_service_factory.cc
+++ b/chrome/browser/invalidation/invalidation_service_factory.cc
@@ -12,6 +12,8 @@
 #include "chrome/browser/invalidation/invalidation_service_android.h"
 #include "chrome/browser/invalidation/invalidator_storage.h"
 #include "chrome/browser/invalidation/ticl_invalidation_service.h"
+#include "chrome/browser/invalidation/ticl_profile_settings_provider.h"
+#include "chrome/browser/invalidation/ticl_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"
@@ -121,9 +123,10 @@ KeyedService* InvalidationServiceFactory::BuildServiceInstanceFor(
 
   TiclInvalidationService* service = new TiclInvalidationService(
       identity_provider.Pass(),
+      scoped_ptr<TiclSettingsProvider>(
+          new TiclProfileSettingsProvider(profile)),
       gcm::GCMProfileServiceFactory::GetForProfile(profile),
-      profile->GetRequestContext(),
-      profile);
+      profile->GetRequestContext());
   service->Init(scoped_ptr<syncer::InvalidationStateTracker>(
       new InvalidatorStorage(profile->GetPrefs())));
   return service;