Reduce dependency of TiclInvalidationService on Profile

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 ef34d2ecf1087f70f7c7aa701a73cb1ce620e16a..a40ea012fd471f742b62744737f9eecd1f5389a1 100644
--- a/chrome/browser/invalidation/invalidation_service_factory.cc
+++ b/chrome/browser/invalidation/invalidation_service_factory.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/invalidation/invalidation_service_factory.h"
 
+#include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_registry.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/invalidation/fake_invalidation_service.h"
@@ -22,6 +23,8 @@
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/user_prefs/pref_registry_syncable.h"
+#include "net/url_request/url_request_context_getter.h"

[dcheng, 2014/04/11 19:54:00]

Do we actually need this include? It looks like it's just a passthrough.

[bartfab (slow), 2014/04/14 09:20:08]

Removed.

+#include "sync/notifier/invalidation_state_tracker.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/invalidation/invalidation_controller_android.h"
@@ -115,8 +118,12 @@ KeyedService* InvalidationServiceFactory::BuildServiceInstanceFor(
         LoginUIServiceFactory::GetForProfile(profile)));
   }
 
-  TiclInvalidationService* service =
-      new TiclInvalidationService(auth_provider.Pass(), profile);
+  TiclInvalidationService* service = new TiclInvalidationService(
+      auth_provider.Pass(),
+      profile->GetRequestContext(),
+      scoped_ptr<syncer::InvalidationStateTracker>(
+          new InvalidatorStorage(profile->GetPrefs())),
+      profile);
   service->Init();
   return service;
 #endif