Reduce dependency of TiclInvalidationService on Profile

chrome/browser/invalidation/invalidation_service_factory.cc

 // Copyright (c) 2013 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/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"
 #include "chrome/browser/invalidation/invalidation_service.h"
 #include "chrome/browser/invalidation/invalidation_service_android.h"
 #include "chrome/browser/invalidation/invalidator_storage.h"
 #include "chrome/browser/invalidation/profile_invalidation_auth_provider.h"
 #include "chrome/browser/invalidation/ticl_invalidation_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #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"
+#include "sync/notifier/invalidation_state_tracker.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/invalidation/invalidation_controller_android.h"
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_CHROMEOS)
 #include "base/files/file_path.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ skipping 73 matching lines @@
   }
 #endif
 
   if (!auth_provider) {
     auth_provider.reset(new ProfileInvalidationAuthProvider(
         SigninManagerFactory::GetForProfile(profile),
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
         LoginUIServiceFactory::GetForProfile(profile)));
   }
 
-  TiclInvalidationService* service =
-      new TiclInvalidationService(auth_provider.Pass(), profile);
-  service->Init();
+  TiclInvalidationService* service = new TiclInvalidationService(
+      auth_provider.Pass(),
+      profile->GetRequestContext(),
+      profile);
+  service->Init(scoped_ptr<syncer::InvalidationStateTracker>(
+      new InvalidatorStorage(profile->GetPrefs())));
   return service;
 #endif
 }
 
 void InvalidationServiceFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kInvalidationServiceUseGCMChannel,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   InvalidatorStorage::RegisterProfilePrefs(registry);
 }
 
 }  // namespace invalidation