Componentize FakeSigninManager and SigninManager prefs

components/signin/core/browser/fake_signin_manager.cc

Index: components/signin/core/browser/fake_signin_manager.cc
diff --git a/chrome/browser/signin/fake_signin_manager.cc b/components/signin/core/browser/fake_signin_manager.cc
similarity index 44%
rename from chrome/browser/signin/fake_signin_manager.cc
rename to components/signin/core/browser/fake_signin_manager.cc
index f81b4b48bf467e8cecb3493bab59776ccdd4685f..c1d4de547dc58279419c30725089ab8dc881ae00 100644
--- a/chrome/browser/signin/fake_signin_manager.cc
+++ b/components/signin/core/browser/fake_signin_manager.cc
@@ -2,56 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/signin/fake_signin_manager.h"
+#include "components/signin/core/browser/fake_signin_manager.h"
 
 #include "base/callback_helpers.h"
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/account_tracker_service_factory.h"
-#include "chrome/browser/signin/chrome_signin_client_factory.h"
-#include "chrome/browser/signin/gaia_cookie_manager_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/global_error/global_error_service.h"
-#include "chrome/browser/ui/global_error/global_error_service_factory.h"
-#include "chrome/common/pref_names.h"
 #include "components/signin/core/browser/account_tracker_service.h"
+#include "components/signin/core/browser/signin_metrics.h"
 
-FakeSigninManagerBase::FakeSigninManagerBase(Profile* profile)
-    : SigninManagerBase(
-          ChromeSigninClientFactory::GetForProfile(profile),
-          AccountTrackerServiceFactory::GetForProfile(profile)) {}
+FakeSigninManagerBase::FakeSigninManagerBase(
+    SigninClient* client,
+    AccountTrackerService* account_tracker_service)
+    : SigninManagerBase(client, account_tracker_service) {}
 
-FakeSigninManagerBase::~FakeSigninManagerBase() {
-}
-
-// static
-scoped_ptr<KeyedService> FakeSigninManagerBase::Build(
-    content::BrowserContext* context) {
-  scoped_ptr<SigninManagerBase> manager;
-  Profile* profile = static_cast<Profile*>(context);
-#if defined(OS_CHROMEOS)
-  manager.reset(new FakeSigninManagerBase(profile));
-#else
-  manager.reset(new FakeSigninManager(profile));
-#endif
-  manager->Initialize(NULL);
-  SigninManagerFactory::GetInstance()
-      ->NotifyObserversOfSigninManagerCreationForTesting(manager.get());
-  return manager.Pass();
-}
+FakeSigninManagerBase::~FakeSigninManagerBase() {}
 
-#if !defined (OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
 
-FakeSigninManager::FakeSigninManager(Profile* profile)
-    : SigninManager(
-          ChromeSigninClientFactory::GetForProfile(profile),
-          ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
-          AccountTrackerServiceFactory::GetForProfile(profile),
-          GaiaCookieManagerServiceFactory::GetForProfile(profile)) {}
+FakeSigninManager::FakeSigninManager(
+    SigninClient* client,
+    ProfileOAuth2TokenService* token_service,
+    AccountTrackerService* account_tracker_service,
+    GaiaCookieManagerService* cookie_manager_service)
+    : SigninManager(client,
+                    token_service,
+                    account_tracker_service,
+                    cookie_manager_service) {}
 
-FakeSigninManager::~FakeSigninManager() {
-}
+FakeSigninManager::~FakeSigninManager() {}
 
 void FakeSigninManager::StartSignInWithRefreshToken(
     const std::string& refresh_token,
@@ -68,29 +45,29 @@ void FakeSigninManager::StartSignInWithRefreshToken(
     oauth_fetched_callback.Run(refresh_token);
 }
 
-
 void FakeSigninManager::CompletePendingSignin() {
   SetAuthenticatedAccountId(GetAccountIdForAuthInProgress());
   set_auth_in_progress(std::string());
-  FOR_EACH_OBSERVER(SigninManagerBase::Observer,
-                    observer_list_,
-                    GoogleSigninSucceeded(authenticated_account_id_,
-                                          username_,
-                                          password_));
+  FOR_EACH_OBSERVER(
+      SigninManagerBase::Observer, observer_list_,
+      GoogleSigninSucceeded(authenticated_account_id_, username_, password_));
 }
 
 void FakeSigninManager::SignIn(const std::string& gaia_id,
                                const std::string& username,
                                const std::string& password) {
-  StartSignInWithRefreshToken(
-      std::string(), gaia_id, username, password,
-      OAuthTokenFetchedCallback());
+  StartSignInWithRefreshToken(std::string(), gaia_id, username, password,
+                              OAuthTokenFetchedCallback());
   CompletePendingSignin();
 }
 
+void FakeSigninManager::ForceSignOut() {
+  prohibit_signout_ = false;
+  SignOut(signin_metrics::SIGNOUT_TEST);
+}
+
 void FakeSigninManager::FailSignin(const GoogleServiceAuthError& error) {
-  FOR_EACH_OBSERVER(SigninManagerBase::Observer,
-                    observer_list_,
+  FOR_EACH_OBSERVER(SigninManagerBase::Observer, observer_list_,
                     GoogleSigninFailed(error));
 }