| Index: chrome/browser/signin/signin_manager_unittest.cc
|
| diff --git a/chrome/browser/signin/signin_manager_unittest.cc b/chrome/browser/signin/signin_manager_unittest.cc
|
| index 75aeafceda1e8ea3c3308eb604a056e87edcda33..982457eff563f29b30af21e09ace62998560f460 100644
|
| --- a/chrome/browser/signin/signin_manager_unittest.cc
|
| +++ b/chrome/browser/signin/signin_manager_unittest.cc
|
| @@ -61,6 +61,7 @@ class SigninManagerTest : public TokenServiceTestHarness {
|
| virtual void TearDown() OVERRIDE {
|
| // Destroy the SigninManager here, because it relies on profile_ which is
|
| // freed in the base class.
|
| + manager_->Shutdown();
|
| manager_.reset(NULL);
|
| TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
|
| prefs_.reset(NULL);
|
| @@ -208,6 +209,7 @@ TEST_F(SigninManagerTest, SignInClientLogin) {
|
| EXPECT_EQ(0U, google_login_failure_.size());
|
|
|
| // Should persist across resets.
|
| + manager_->Shutdown();
|
| manager_.reset(new SigninManager());
|
| manager_->Initialize(profile_.get());
|
| EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
|
| @@ -277,6 +279,7 @@ TEST_F(SigninManagerTest, SignInWithCredentials) {
|
| EXPECT_EQ(0U, google_login_failure_.size());
|
|
|
| // Should persist across resets.
|
| + manager_->Shutdown();
|
| manager_.reset(new SigninManager());
|
| manager_->Initialize(profile_.get());
|
| EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
|
| @@ -340,6 +343,7 @@ TEST_F(SigninManagerTest, ClearTransientSigninData) {
|
| profile_->GetPrefs()->GetString(prefs::kGoogleServicesUsername).empty());
|
|
|
| // On reset it should be regenerated.
|
| + manager_->Shutdown();
|
| manager_.reset(new SigninManager());
|
| manager_->Initialize(profile_.get());
|
|
|
| @@ -358,6 +362,7 @@ TEST_F(SigninManagerTest, SignOutClientLogin) {
|
| EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
|
| EXPECT_FALSE(profile_->GetPrefs()->GetBoolean(prefs::kIsGooglePlusUser));
|
| // Should not be persisted anymore
|
| + manager_->Shutdown();
|
| manager_.reset(new SigninManager());
|
| manager_->Initialize(profile_.get());
|
| EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
|
| @@ -375,6 +380,7 @@ TEST_F(SigninManagerTest, SignInFailureClientLogin) {
|
| EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
|
|
|
| // Should not be persisted
|
| + manager_->Shutdown();
|
| manager_.reset(new SigninManager());
|
| manager_->Initialize(profile_.get());
|
| EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
|
|
|