sync: change semantics (and name) of SigninManager::GetUsername

chrome/browser/sync/signin_manager_unittest.cc

 // Copyright (c) 2011 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/sync/signin_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/net/gaia/token_service.h"
@@ skipping 81 matching lines @@
   TestNotificationTracker google_login_success_;
   TestNotificationTracker google_login_failure_;
   bool originally_using_oauth_;
 };
 
 // NOTE: ClientLogin's "StartSignin" is called after collecting credentials
 //       from the user.  See also SigninManagerTest::SignInOAuth.
 TEST_F(SigninManagerTest, SignInClientLogin) {
   browser_sync::SetIsUsingOAuthForTest(false);
   manager_->Initialize(profile_.get());
-  EXPECT_TRUE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 
   manager_->StartSignIn("username", "password", "", "");
-  EXPECT_FALSE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 
   SimulateValidResponseClientLogin();
+  EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty());
 
   // 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_.reset(new SigninManager());
   manager_->Initialize(profile_.get());
-  EXPECT_EQ("user@gmail.com", manager_->GetUsername());
+  EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
 }
 
-TEST_F(SigninManagerTest, ClearInMemoryData) {
+TEST_F(SigninManagerTest, ClearTransientSigninData) {
   browser_sync::SetIsUsingOAuthForTest(false);
   manager_->Initialize(profile_.get());
-  EXPECT_TRUE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 
   manager_->StartSignIn("username", "password", "", "");
-  EXPECT_FALSE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 
   SimulateValidResponseClientLogin();
 
   // Should go into token service and stop.
   EXPECT_EQ(1U, google_login_success_.size());
   EXPECT_EQ(0U, google_login_failure_.size());
 
-  EXPECT_EQ("user@gmail.com", manager_->GetUsername());
+  EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
 
   // Now clear the in memory data.
-  manager_->ClearInMemoryData();
-  EXPECT_TRUE(manager_->GetUsername().empty());
+  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_.reset(new SigninManager());
   manager_->Initialize(profile_.get());
 
   // Now make sure we have the right user name.
-  EXPECT_EQ("user@gmail.com", manager_->GetUsername());
+  EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
 }
 
-
 // NOTE: OAuth's "StartOAuthSignIn" is called before collecting credentials
 //       from the user.  See also SigninManagerTest::SignInClientLogin.
 TEST_F(SigninManagerTest, SignInOAuth) {
   browser_sync::SetIsUsingOAuthForTest(true);
   manager_->Initialize(profile_.get());
-  EXPECT_TRUE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 
   SimulateValidSigninOAuth();
-  EXPECT_FALSE(manager_->GetUsername().empty());
+  EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty());
 
   // 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_.reset(new SigninManager());
   manager_->Initialize(profile_.get());
-  EXPECT_EQ("user-xZIuqTKu@gmail.com", manager_->GetUsername());
+  EXPECT_EQ("user-xZIuqTKu@gmail.com", manager_->GetAuthenticatedUsername());
 }
 
 TEST_F(SigninManagerTest, SignOutClientLogin) {
   browser_sync::SetIsUsingOAuthForTest(false);
   manager_->Initialize(profile_.get());
   manager_->StartSignIn("username", "password", "", "");
   SimulateValidResponseClientLogin();
   manager_->OnClientLoginSuccess(credentials_);
 
-  EXPECT_EQ("user@gmail.com", manager_->GetUsername());
+  EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
   manager_->SignOut();
-  EXPECT_TRUE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
   // Should not be persisted anymore
   manager_.reset(new SigninManager());
   manager_->Initialize(profile_.get());
-  EXPECT_TRUE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 }
 
 TEST_F(SigninManagerTest, SignOutOAuth) {
   browser_sync::SetIsUsingOAuthForTest(true);
   manager_->Initialize(profile_.get());
 
   SimulateValidSigninOAuth();
-  EXPECT_FALSE(manager_->GetUsername().empty());
+  EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty());
 
-  EXPECT_EQ("user-xZIuqTKu@gmail.com", manager_->GetUsername());
+  EXPECT_EQ("user-xZIuqTKu@gmail.com", manager_->GetAuthenticatedUsername());
   manager_->SignOut();
-  EXPECT_TRUE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 
   // Should not be persisted anymore
   manager_.reset(new SigninManager());
   manager_->Initialize(profile_.get());
-  EXPECT_TRUE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 }
 
 TEST_F(SigninManagerTest, SignInFailureClientLogin) {
   browser_sync::SetIsUsingOAuthForTest(false);
   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_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 
   // Should not be persisted
   manager_.reset(new SigninManager());
   manager_->Initialize(profile_.get());
-  EXPECT_TRUE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 }
 
 TEST_F(SigninManagerTest, ProvideSecondFactorSuccess) {
   browser_sync::SetIsUsingOAuthForTest(false);
   manager_->Initialize(profile_.get());
   manager_->StartSignIn("username", "password", "", "");
   GoogleServiceAuthError error(GoogleServiceAuthError::TWO_FACTOR);
   manager_->OnClientLoginFailure(error);
 
   EXPECT_EQ(0U, google_login_success_.size());
   EXPECT_EQ(1U, google_login_failure_.size());
 
-  EXPECT_FALSE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
+  EXPECT_FALSE(manager_->possibly_invalid_username_.empty());
 
   manager_->ProvideSecondFactorAccessCode("access");
   SimulateValidResponseClientLogin();
 
   EXPECT_EQ(1U, google_login_success_.size());
   EXPECT_EQ(1U, google_login_failure_.size());
 }
 
 TEST_F(SigninManagerTest, ProvideSecondFactorFailure) {
   browser_sync::SetIsUsingOAuthForTest(false);
   manager_->Initialize(profile_.get());
   manager_->StartSignIn("username", "password", "", "");
   GoogleServiceAuthError error1(GoogleServiceAuthError::TWO_FACTOR);
   manager_->OnClientLoginFailure(error1);
 
   EXPECT_EQ(0U, google_login_success_.size());
   EXPECT_EQ(1U, google_login_failure_.size());
 
-  EXPECT_FALSE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
+  EXPECT_FALSE(manager_->possibly_invalid_username_.empty());
 
   manager_->ProvideSecondFactorAccessCode("badaccess");
   GoogleServiceAuthError error2(
       GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
   manager_->OnClientLoginFailure(error2);
 
   EXPECT_EQ(0U, google_login_success_.size());
   EXPECT_EQ(2U, google_login_failure_.size());
-  EXPECT_FALSE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 
   manager_->ProvideSecondFactorAccessCode("badaccess");
   GoogleServiceAuthError error3(GoogleServiceAuthError::CONNECTION_FAILED);
   manager_->OnClientLoginFailure(error3);
 
   EXPECT_EQ(0U, google_login_success_.size());
   EXPECT_EQ(3U, google_login_failure_.size());
-  EXPECT_TRUE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 }
 
 TEST_F(SigninManagerTest, SignOutMidConnect) {
   browser_sync::SetIsUsingOAuthForTest(false);
   manager_->Initialize(profile_.get());
   manager_->StartSignIn("username", "password", "", "");
   manager_->SignOut();
   EXPECT_EQ(0U, google_login_success_.size());
   EXPECT_EQ(0U, google_login_failure_.size());
 
-  EXPECT_TRUE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 }
 
 TEST_F(SigninManagerTest, SignOutOnUserInfoSucessRaceTest) {
   browser_sync::SetIsUsingOAuthForTest(true);
   manager_->Initialize(profile_.get());
-  EXPECT_TRUE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 
   SimulateSigninStartOAuth();
   manager_->SignOut();
   SimulateOAuthUserInfoSuccess();
-  EXPECT_TRUE(manager_->GetUsername().empty());
+  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 }