Move auth-error reporting code out of SyncGlobalError and into SigninGlobalError

chrome/browser/signin/signin_manager_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 "chrome/browser/signin/signin_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/stringprintf.h"
@@ skipping 43 matching lines @@
     google_login_success_.ListenFor(
         chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
         content::Source<Profile>(profile_.get()));
     google_login_failure_.ListenFor(chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED,
                                     content::Source<Profile>(profile_.get()));
   }
 
   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);
     TokenServiceTestHarness::TearDown();
   }
 
   void SetupFetcherAndComplete(const std::string& url,
                                int response_code,
                                const net::ResponseCookies& cookies,
                                const std::string& response_string) {
@@ skipping 127 matching lines @@
 
   SimulateValidResponseClientLogin(true);
   EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty());
   EXPECT_TRUE(profile_->GetPrefs()->GetBoolean(prefs::kIsGooglePlusUser));
 
   // Should go into token service and stop.
   EXPECT_EQ(1U, google_login_success_.size());
   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());
 }
 
 TEST_F(SigninManagerTest, Prohibited) {
   g_browser_process->local_state()->SetString(
       prefs::kGoogleServicesUsernamePattern, ".*@google.com");
   manager_->Initialize(profile_.get());
   EXPECT_TRUE(manager_->IsAllowedUsername("test@google.com"));
@@ skipping 49 matching lines @@
 
   // This is flow, the oauth2 credentials should already be available in
   // the token service.
   EXPECT_TRUE(service_->HasOAuthLoginToken());
 
   // Should go into token service and stop.
   EXPECT_EQ(1U, google_login_success_.size());
   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());
 }
 
 TEST_F(SigninManagerTest, SignInWithCredentialsWrongEmail) {
   manager_->Initialize(profile_.get());
   EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 
   // If the email address used to start the sign in does not match the
@@ skipping 43 matching lines @@
   // Now clear the in memory data.
   manager_->ClearTransientSigninData();
   EXPECT_TRUE(manager_->last_result_.data.empty());
   EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty());
 
   // Ensure preferences are not modified.
   EXPECT_FALSE(
      profile_->GetPrefs()->GetString(prefs::kGoogleServicesUsername).empty());
 
   // On reset it should be regenerated.
+  manager_->Shutdown();
   manager_.reset(new SigninManager());
   manager_->Initialize(profile_.get());
 
   // Now make sure we have the right user name.
   EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
 }
 
 TEST_F(SigninManagerTest, SignOutClientLogin) {
   manager_->Initialize(profile_.get());
   manager_->StartSignIn("username", "password", "", "");
   SimulateValidResponseClientLogin(false);
   manager_->OnClientLoginSuccess(credentials_);
 
   EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
   manager_->SignOut();
   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());
 }
 
 TEST_F(SigninManagerTest, SignInFailureClientLogin) {
   manager_->Initialize(profile_.get());
   manager_->StartSignIn("username", "password", "", "");
   GoogleServiceAuthError error(GoogleServiceAuthError::REQUEST_CANCELED);
   manager_->OnClientLoginFailure(error);
 
   EXPECT_EQ(0U, google_login_success_.size());
   EXPECT_EQ(1U, google_login_failure_.size());
 
   EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 
   // Should not be persisted
+  manager_->Shutdown();
   manager_.reset(new SigninManager());
   manager_->Initialize(profile_.get());
   EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 }
 
 TEST_F(SigninManagerTest, ProvideSecondFactorSuccess) {
   manager_->Initialize(profile_.get());
   manager_->StartSignIn("username", "password", "", "");
   GoogleServiceAuthError error(GoogleServiceAuthError::TWO_FACTOR);
   manager_->OnClientLoginFailure(error);
@@ skipping 96 matching lines @@
 
   manager_->ProvideOAuthChallengeResponse(
       GoogleServiceAuthError::CAPTCHA_REQUIRED, "token", "solution");
 
   SimulateProvideOAuthChallengeResponseValid();
   EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
 
   EXPECT_EQ(1U, google_login_success_.size());
   EXPECT_EQ(1U, google_login_failure_.size());
 }