Make ChromeSigninClient a BrowserContextKeyedService

chrome/browser/signin/signin_manager_factory.cc

 // Copyright (c) 2012 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/signin/signin_manager_factory.h"
 
 #include "base/prefs/pref_registry_simple.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/signin/chrome_signin_client.h"
+#include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/local_auth.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/common/pref_names.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 
 SigninManagerFactory::SigninManagerFactory()
     : BrowserContextKeyedServiceFactory(
         "SigninManager",
         BrowserContextDependencyManager::GetInstance()) {
+  DependsOn(ChromeSigninClientFactory::GetInstance());
   DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());
 }
 
 SigninManagerFactory::~SigninManagerFactory() {
 #if defined(OS_MACOSX)
   // Check that the number of remaining observers is as expected. Mac has a
   // known issue wherein there might be a remaining observer
   // (UIAppListViewDelegate).
   int num_observers = 0;
   if (observer_list_.might_have_observers()) {
@@ skipping 89 matching lines @@
 }
 
 BrowserContextKeyedService* SigninManagerFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   SigninManagerBase* service = NULL;
   Profile* profile = static_cast<Profile*>(context);
 #if defined(OS_CHROMEOS)
   service = new SigninManagerBase();
 #else
   service = new SigninManager(
-      scoped_ptr<SigninClient>(new ChromeSigninClient(profile)));
+      ChromeSigninClientFactory::GetInstance()->GetForProfile(profile));
 #endif
   service->Initialize(profile, g_browser_process->local_state());
   FOR_EACH_OBSERVER(Observer, observer_list_, SigninManagerCreated(service));
   return service;
 }
 
 void SigninManagerFactory::BrowserContextShutdown(
     content::BrowserContext* context) {
   SigninManagerBase* manager = static_cast<SigninManagerBase*>(
       GetServiceForBrowserContext(context, false));
   if (manager)
     FOR_EACH_OBSERVER(Observer, observer_list_, SigninManagerShutdown(manager));
   BrowserContextKeyedServiceFactory::BrowserContextShutdown(context);
 }