Remove Profile dependency from TiclInvalidationService

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/ticl_invalidation_service.h"
+#include "chrome/browser/invalidation/ticl_invalidation_service_profile_settings_provider.h"
+#include "chrome/browser/invalidation/ticl_invalidation_service_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"
 #include "chrome/browser/signin/profile_identity_provider.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"
@@ skipping 26 matching lines @@
   // itself. Using ProfileHelper::GetSigninProfileDir() is safe because it does
   // not try to access the sign-in profile.
   if (profile->GetPath() == chromeos::ProfileHelper::GetSigninProfileDir()||
       (chromeos::UserManager::IsInitialized() &&
        chromeos::UserManager::Get()->IsLoggedInAsGuest())) {
     // The Chrome OS login and Chrome OS guest profiles do not have GAIA
     // credentials and do not support invalidation.
     return NULL;
   }
 #endif
+  if (profile->IsManaged()) {

[dcheng, 2014/04/24 18:26:54]

Nit: Not sure why this is needed in this CL. Is this a bug that we overlooked
previously? If it's unrelated, I'd prefer to see it moved to a separate patch
(I'm happy to LGTM+CQ that).

[bartfab (slow), 2014/04/24 19:14:48]

This was previously handled by TiclInvalidationService::IsReadyToStart()
returning false for managed profiles, which led to yet another Profile
dependency. I moved this change to a separate CL now.

+    // Managed profiles do not have GAIA credentials and do not support
+    // invalidation.
+    return NULL;
+  }
+
   return static_cast<InvalidationService*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
 InvalidationServiceFactory* InvalidationServiceFactory::GetInstance() {
   return Singleton<InvalidationServiceFactory>::get();
 }
 
 InvalidationServiceFactory::InvalidationServiceFactory()
@@ skipping 43 matching lines @@
 
   if (!identity_provider) {
     identity_provider.reset(new ProfileIdentityProvider(
         SigninManagerFactory::GetForProfile(profile),
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
         LoginUIServiceFactory::GetForProfile(profile)));
   }
 
   TiclInvalidationService* service = new TiclInvalidationService(
       identity_provider.Pass(),
+      scoped_ptr<TiclInvalidationServiceSettingsProvider>(
+          new TiclInvalidationServiceProfileSettingsProvider(profile)),
       gcm::GCMProfileServiceFactory::GetForProfile(profile),
-      profile->GetRequestContext(),
-      profile);
+      profile->GetRequestContext());
   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