Merge 182705

chrome/browser/policy/user_policy_signin_service_unittest.cc

Index: chrome/browser/policy/user_policy_signin_service_unittest.cc
===================================================================
--- chrome/browser/policy/user_policy_signin_service_unittest.cc	(revision 183433)
+++ chrome/browser/policy/user_policy_signin_service_unittest.cc	(working copy)
@@ -110,8 +110,9 @@
     EXPECT_CALL(*mock_store_, Load()).Times(AnyNumber());
     manager_.reset(new UserCloudPolicyManager(
         profile_.get(), scoped_ptr<UserCloudPolicyStore>(mock_store_)));
-    SigninManagerFactory::GetInstance()->SetTestingFactory(
-        profile_.get(), FakeSigninManager::Build);
+    signin_manager_ = static_cast<FakeSigninManager*>(
+        SigninManagerFactory::GetInstance()->SetTestingFactoryAndUse(
+            profile_.get(), FakeSigninManager::Build));
 
     // Make sure the UserPolicySigninService is created.
     UserPolicySigninServiceFactory::GetForProfile(profile_.get());
@@ -247,6 +248,8 @@
 
   net::TestURLFetcherFactory url_factory_;
 
+  FakeSigninManager* signin_manager_;
+
   // Used in conjunction with OnRegisterCompleted() to test client registration
   // callbacks.
   scoped_ptr<CloudPolicyClient> created_client_;
@@ -623,8 +626,7 @@
 TEST_F(UserPolicySigninServiceTest, SignOutThenSignInAgain) {
   TestSuccessfulSignin();
 
-  // Now sign out.
-  SigninManagerFactory::GetForProfile(profile_.get())->SignOut();
+  signin_manager_->ForceSignOut();
   ASSERT_FALSE(manager_->core()->service());
 
   // Now sign in again.