Componentize FakeSigninManager and SigninManager prefs

chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc

Index: chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
index 65c496e7454a7950ad437fb660e1cdab8fcabee5..cca6b8286f47925364cd9c2bc56f6f41cad4a6dd 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
+++ b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
@@ -15,10 +15,11 @@
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/account_fetcher_service_factory.h"
+#include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/fake_account_fetcher_service.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
-#include "chrome/browser/signin/fake_signin_manager.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/signin/test_signin_client_builder.h"
@@ -34,6 +35,7 @@
 #include "components/policy/core/common/schema_registry.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
+#include "components/signin/core/browser/fake_signin_manager.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/notification_details.h"
@@ -83,24 +85,17 @@ const char kHostedDomainResponse[] =
     "  \"hd\": \"test.com\""
     "}";
 
-class SigninManagerFake : public FakeSigninManager {
- public:
-  explicit SigninManagerFake(Profile* profile)
-      : FakeSigninManager(profile) {
-    Initialize(NULL);
-  }
-
-  void ForceSignOut() {
-    // Allow signing out now.
-    prohibit_signout_ = false;
-    SignOut(signin_metrics::SIGNOUT_TEST);
-  }
-
-  static scoped_ptr<KeyedService> Build(content::BrowserContext* profile) {
-    return make_scoped_ptr(
-        new SigninManagerFake(static_cast<Profile*>(profile)));
-  }
-};
+scoped_ptr<KeyedService> BuildFakeSigninManager(
+    content::BrowserContext* context) {
+  Profile* profile = static_cast<Profile*>(context);
+  scoped_ptr<FakeSigninManager> manager(new FakeSigninManager(
+      ChromeSigninClientFactory::GetForProfile(profile),
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
+      AccountTrackerServiceFactory::GetForProfile(profile),
+      GaiaCookieManagerServiceFactory::GetForProfile(profile)));
+  manager->Initialize(nullptr);
+  return manager.Pass();
+}

[Roger Tawa OOO till Jul 10th, 2015/07/24 14:46:50]

Nit: not possible to use BuildFakeSigninManagerBase() in this file instead of
defining this new factory function here?

[droger, 2015/07/24 14:57:03]

I don't know.
BuildFakeSigninManagerBase calls
NotifyObserversOfSigninManagerCreationForTesting, which is not done here. I'll
try.

[droger, 2015/07/24 15:03:19]

BuildFakeSigninManagerBase also returns a SigninManagerBase, not a SigninManager
on ChromeOS.
If this code is ever called on ChromeOS it will not work.
I don't know if this is the case.

 
 UserCloudPolicyManager* BuildCloudPolicyManager(
     content::BrowserContext* context) {
@@ -183,7 +178,7 @@ class UserPolicySigninServiceTest : public testing::Test {
     TestingProfile::Builder builder;
     builder.SetPrefService(scoped_ptr<PrefServiceSyncable>(prefs.Pass()));
     builder.AddTestingFactory(SigninManagerFactory::GetInstance(),
-                              SigninManagerFake::Build);
+                              BuildFakeSigninManager);
     builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(),
                               BuildFakeProfileOAuth2TokenService);
     builder.AddTestingFactory(AccountFetcherServiceFactory::GetInstance(),
@@ -194,7 +189,7 @@ class UserPolicySigninServiceTest : public testing::Test {
     profile_ = builder.Build().Pass();
     url_factory_.set_remove_fetcher_on_delete(true);
 
-    signin_manager_ = static_cast<SigninManagerFake*>(
+    signin_manager_ = static_cast<FakeSigninManager*>(
         SigninManagerFactory::GetForProfile(profile_.get()));
     // Tests are responsible for freeing the UserCloudPolicyManager instances
     // they inject.
@@ -369,7 +364,7 @@ class UserPolicySigninServiceTest : public testing::Test {
 
   net::TestURLFetcherFactory url_factory_;
 
-  SigninManagerFake* signin_manager_;
+  FakeSigninManager* signin_manager_;
 
   // Used in conjunction with OnRegisterCompleted() to test client registration
   // callbacks.