| Index: chrome/browser/policy/user_policy_signin_service_unittest.cc
|
| diff --git a/chrome/browser/policy/user_policy_signin_service_unittest.cc b/chrome/browser/policy/user_policy_signin_service_unittest.cc
|
| index 57438897c8f3ee05bab37095e2acb12ba0d6c953..64460c22af7b8a36e7ffbe3f7c5c713a1728af69 100644
|
| --- a/chrome/browser/policy/user_policy_signin_service_unittest.cc
|
| +++ b/chrome/browser/policy/user_policy_signin_service_unittest.cc
|
| @@ -110,8 +110,9 @@ class UserPolicySigninServiceTest : public testing::Test {
|
| 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 @@ class UserPolicySigninServiceTest : public testing::Test {
|
|
|
| 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, FetchPolicySuccess) {
|
| 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.
|
|
|