Make ChromeSigninClient a BrowserContextKeyedService

chrome/browser/signin/signin_manager_unittest.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.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/prefs/browser_prefs.h"
-#include "chrome/browser/signin/chrome_signin_client.h"
+#include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/child_process_security_policy.h"
@@ skipping 20 matching lines @@
     "  \"token_type\": \"Bearer\""
     "}";
 
 const char kUberAuthTokenURLFormat[] = "?source=%s&issueuberauth=1";
 
 BrowserContextKeyedService* SigninManagerBuild(
     content::BrowserContext* context) {
   SigninManager* service = NULL;
   Profile* profile = static_cast<Profile*>(context);
   service = new SigninManager(
-      scoped_ptr<SigninClient>(new ChromeSigninClient(profile)));
+      ChromeSigninClientFactory::GetInstance()->GetForProfile(profile));
   service->Initialize(profile, NULL);
   return service;
 }
 
 class TestSigninManagerObserver : public SigninManagerBase::Observer {
  public:
   TestSigninManagerObserver() : num_failed_signins_(0),
                                 num_successful_signins_(0),
                                 num_signouts_(0) {
   }
@@ skipping 70 matching lines @@
     manager_ = static_cast<SigninManager*>(
         SigninManagerFactory::GetInstance()->SetTestingFactoryAndUse(
             profile(), SigninManagerBuild));
     manager_->AddObserver(&test_observer_);
   }
 
   // Create a naked signin manager if integration with PKSs is not needed.
   void CreateNakedSigninManager() {
     DCHECK(!manager_);
     naked_manager_.reset(new SigninManager(
-        scoped_ptr<SigninClient>(new ChromeSigninClient(profile()))));
+        ChromeSigninClientFactory::GetInstance()->GetForProfile(profile())));
 
     manager_ = naked_manager_.get();
     manager_->AddObserver(&test_observer_);
   }
 
   // Shuts down |manager_|.
   void ShutDownManager() {
     DCHECK(manager_);
     manager_->RemoveObserver(&test_observer_);
     manager_->Shutdown();
@@ skipping 411 matching lines @@
             profile()->GetPrefs()->GetString(prefs::kGoogleServicesUsername));
   EXPECT_EQ("external@example.com", manager_->GetAuthenticatedUsername());
 }
 
 TEST_F(SigninManagerTest, SigninNotAllowed) {
   std::string user("user@google.com");
   profile()->GetPrefs()->SetString(prefs::kGoogleServicesUsername, user);
   profile()->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false);
   CreateSigninManagerAsService();
 }