Merge 182705

chrome/browser/policy/user_policy_signin_service_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 "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud_policy_constants.h"
@@ skipping 92 matching lines @@
     chrome::RegisterUserPrefs(prefs.get(), prefs->registry());
     TestingProfile::Builder builder;
     builder.SetPrefService(scoped_ptr<PrefServiceSyncable>(prefs.Pass()));
     profile_ = builder.Build().Pass();
     profile_->CreateRequestContext();
 
     mock_store_ = new MockUserCloudPolicyStore();
     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());
     Mock::VerifyAndClearExpectations(mock_store_);
     url_factory_.set_remove_fetcher_on_delete(true);
   }
 
   virtual void TearDown() OVERRIDE {
     // Free the profile before we clear out the browser prefs.
     profile_.reset();
@@ skipping 115 matching lines @@
 
   // BrowserPolicyConnector and UrlFetcherFactory want to initialize and free
   // various components asynchronously via tasks, so create fake threads here.
   MessageLoop loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
 
   net::TestURLFetcherFactory url_factory_;
 
+  FakeSigninManager* signin_manager_;
+
   // Used in conjunction with OnRegisterCompleted() to test client registration
   // callbacks.
   scoped_ptr<CloudPolicyClient> created_client_;
 
   // True if OnRegisterCompleted() was called.
   bool register_completed_;
 
   // Weak ptr to the MockDeviceManagementService (object is owned by the
   // BrowserPolicyConnector).
   MockDeviceManagementService* device_management_service_;
@@ skipping 356 matching lines @@
   ASSERT_TRUE(manager_->core()->service());
 }
 
 TEST_F(UserPolicySigninServiceTest, FetchPolicySuccess) {
   TestSuccessfulSignin();
 }
 
 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.
   TestSuccessfulSignin();
 }
 
 }  // namespace
 
 }  // namespace policy