summaryrefslogtreecommitdiffstats
path: root/chrome/browser/signin
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/signin')
-rw-r--r--chrome/browser/signin/about_signin_internals.cc7
-rw-r--r--chrome/browser/signin/about_signin_internals_factory.cc23
-rw-r--r--chrome/browser/signin/oauth2_token_service_unittest.cc12
-rw-r--r--chrome/browser/signin/signin_internals_util.cc16
-rw-r--r--chrome/browser/signin/signin_manager.cc13
-rw-r--r--chrome/browser/signin/signin_manager_factory.cc9
-rw-r--r--chrome/browser/signin/signin_manager_unittest.cc27
-rw-r--r--chrome/browser/signin/token_service_unittest.cc2
8 files changed, 52 insertions, 57 deletions
diff --git a/chrome/browser/signin/about_signin_internals.cc b/chrome/browser/signin/about_signin_internals.cc
index e58a013..ad83b0d 100644
--- a/chrome/browser/signin/about_signin_internals.cc
+++ b/chrome/browser/signin/about_signin_internals.cc
@@ -25,8 +25,7 @@ AboutSigninInternals::AboutSigninInternals() : profile_(NULL) {
for (size_t i = 0; i < kNumTokenPrefs; ++i) {
signin_status_.token_info_map.insert(std::pair<std::string, TokenInfo>(
kTokenPrefsArray[i],
- TokenInfo(
- std::string(), "Not Loaded", std::string(), kTokenPrefsArray[i])));
+ TokenInfo("", "Not Loaded", "", kTokenPrefsArray[i])));
}
}
@@ -171,7 +170,7 @@ void AboutSigninInternals::NotifyTokenReceivedFailure(
const std::string value_pref = TokenPrefPath(token_name) + ".value";
const std::string time_pref = TokenPrefPath(token_name) + ".time";
const std::string status_pref = TokenPrefPath(token_name) + ".status";
- profile_->GetPrefs()->SetString(value_pref.c_str(), std::string());
+ profile_->GetPrefs()->SetString(value_pref.c_str(), "");
profile_->GetPrefs()->SetString(time_pref.c_str(), time_as_str);
profile_->GetPrefs()->SetString(status_pref.c_str(), error);
@@ -187,7 +186,7 @@ void AboutSigninInternals::NotifyClearStoredToken(
signin_status_.token_info_map[token_name].token.clear();
const std::string value_pref = TokenPrefPath(token_name) + ".value";
- profile_->GetPrefs()->SetString(value_pref.c_str(), std::string());
+ profile_->GetPrefs()->SetString(value_pref.c_str(), "");
NotifyObservers();
}
diff --git a/chrome/browser/signin/about_signin_internals_factory.cc b/chrome/browser/signin/about_signin_internals_factory.cc
index f5f197f..ccce353 100644
--- a/chrome/browser/signin/about_signin_internals_factory.cc
+++ b/chrome/browser/signin/about_signin_internals_factory.cc
@@ -42,8 +42,7 @@ void AboutSigninInternalsFactory::RegisterUserPrefs(
for (int i = UNTIMED_FIELDS_BEGIN; i < UNTIMED_FIELDS_END; ++i) {
const std::string pref_path = SigninStatusFieldToString(
static_cast<UntimedSigninStatusField>(i));
- user_prefs->RegisterStringPref(pref_path.c_str(),
- std::string(),
+ user_prefs->RegisterStringPref(pref_path.c_str(), "",
PrefRegistrySyncable::UNSYNCABLE_PREF);
}
for (int i = TIMED_FIELDS_BEGIN; i < TIMED_FIELDS_END; ++i) {
@@ -51,10 +50,10 @@ void AboutSigninInternalsFactory::RegisterUserPrefs(
static_cast<TimedSigninStatusField>(i)) + ".value";
const std::string time = SigninStatusFieldToString(
static_cast<TimedSigninStatusField>(i)) + ".time";
- user_prefs->RegisterStringPref(
- value.c_str(), std::string(), PrefRegistrySyncable::UNSYNCABLE_PREF);
- user_prefs->RegisterStringPref(
- time.c_str(), std::string(), PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs->RegisterStringPref(value.c_str(), "",
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs->RegisterStringPref(time.c_str(), "",
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
}
// TokenService information for about:signin-internals.
for (size_t i = 0; i < kNumTokenPrefs; i++) {
@@ -62,12 +61,12 @@ void AboutSigninInternalsFactory::RegisterUserPrefs(
const std::string value = pref + ".value";
const std::string status = pref + ".status";
const std::string time = pref + ".time";
- user_prefs->RegisterStringPref(
- value.c_str(), std::string(), PrefRegistrySyncable::UNSYNCABLE_PREF);
- user_prefs->RegisterStringPref(
- status.c_str(), std::string(), PrefRegistrySyncable::UNSYNCABLE_PREF);
- user_prefs->RegisterStringPref(
- time.c_str(), std::string(), PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs->RegisterStringPref(value.c_str(), "",
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs->RegisterStringPref(status.c_str(), "",
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
+ user_prefs->RegisterStringPref(time.c_str(), "",
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
}
}
diff --git a/chrome/browser/signin/oauth2_token_service_unittest.cc b/chrome/browser/signin/oauth2_token_service_unittest.cc
index 7095b43..3649374 100644
--- a/chrome/browser/signin/oauth2_token_service_unittest.cc
+++ b/chrome/browser/signin/oauth2_token_service_unittest.cc
@@ -138,7 +138,7 @@ TEST_F(OAuth2TokenServiceTest, FailureShouldNotRetry) {
net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
EXPECT_TRUE(fetcher);
fetcher->set_response_code(net::HTTP_UNAUTHORIZED);
- fetcher->SetResponseString(std::string());
+ fetcher->SetResponseString("");
fetcher->delegate()->OnURLFetchComplete(fetcher);
EXPECT_EQ(0, consumer_.number_of_correct_tokens_);
EXPECT_EQ(1, consumer_.number_of_errors_);
@@ -251,7 +251,7 @@ TEST_F(OAuth2TokenServiceTest, SuccessAndExpirationAndFailure) {
fetcher = factory_.GetFetcherByID(0);
EXPECT_TRUE(fetcher);
fetcher->set_response_code(net::HTTP_UNAUTHORIZED);
- fetcher->SetResponseString(std::string());
+ fetcher->SetResponseString("");
fetcher->delegate()->OnURLFetchComplete(fetcher);
EXPECT_EQ(1, consumer_.number_of_correct_tokens_);
EXPECT_EQ(1, consumer_.number_of_errors_);
@@ -374,7 +374,7 @@ TEST_F(OAuth2TokenServiceTest, SuccessAndSignOutAndRequest) {
// Signs out
service_->IssueAuthTokenForTest(GaiaConstants::kGaiaOAuth2LoginRefreshToken,
- std::string());
+ "");
service_->EraseTokensFromDB();
request = oauth2_service_->StartRequest(std::set<std::string>(), &consumer_);
@@ -404,7 +404,7 @@ TEST_F(OAuth2TokenServiceTest, SuccessAndSignOutAndSignInAndSuccess) {
// Signs out and signs in
service_->IssueAuthTokenForTest(GaiaConstants::kGaiaOAuth2LoginRefreshToken,
- std::string());
+ "");
service_->EraseTokensFromDB();
service_->IssueAuthTokenForTest(GaiaConstants::kGaiaOAuth2LoginRefreshToken,
"refreshToken");
@@ -486,7 +486,7 @@ TEST_F(OAuth2TokenServiceTest, RetryingConsumer) {
net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
EXPECT_TRUE(fetcher);
fetcher->set_response_code(net::HTTP_UNAUTHORIZED);
- fetcher->SetResponseString(std::string());
+ fetcher->SetResponseString("");
fetcher->delegate()->OnURLFetchComplete(fetcher);
EXPECT_EQ(0, consumer.number_of_correct_tokens_);
EXPECT_EQ(1, consumer.number_of_errors_);
@@ -494,7 +494,7 @@ TEST_F(OAuth2TokenServiceTest, RetryingConsumer) {
fetcher = factory_.GetFetcherByID(0);
EXPECT_TRUE(fetcher);
fetcher->set_response_code(net::HTTP_UNAUTHORIZED);
- fetcher->SetResponseString(std::string());
+ fetcher->SetResponseString("");
fetcher->delegate()->OnURLFetchComplete(fetcher);
EXPECT_EQ(0, consumer.number_of_correct_tokens_);
EXPECT_EQ(2, consumer.number_of_errors_);
diff --git a/chrome/browser/signin/signin_internals_util.cc b/chrome/browser/signin/signin_internals_util.cc
index f187418..adae0a1 100644
--- a/chrome/browser/signin/signin_internals_util.cc
+++ b/chrome/browser/signin/signin_internals_util.cc
@@ -98,11 +98,11 @@ std::string SigninStatusFieldToString(UntimedSigninStatusField field) {
ENUM_CASE(LSID);
case UNTIMED_FIELDS_END:
NOTREACHED();
- return std::string();
+ return "";
}
NOTREACHED();
- return std::string();
+ return "";
}
std::string SigninStatusFieldToString(TimedSigninStatusField field) {
@@ -113,11 +113,11 @@ std::string SigninStatusFieldToString(TimedSigninStatusField field) {
ENUM_CASE(GET_USER_INFO_STATUS);
case TIMED_FIELDS_END:
NOTREACHED();
- return std::string();
+ return "";
}
NOTREACHED();
- return std::string();
+ return "";
}
SigninStatus::SigninStatus()
@@ -203,10 +203,10 @@ std::string SigninStatusFieldToLabel(UntimedSigninStatusField field) {
return "Sid (Hash)";
case UNTIMED_FIELDS_END:
NOTREACHED();
- return std::string();
+ return "";
}
NOTREACHED();
- return std::string();
+ return "";
}
TimedSigninStatusValue SigninStatusFieldToLabel(
@@ -226,10 +226,10 @@ TimedSigninStatusValue SigninStatusFieldToLabel(
"Last OnGetUserInfo Time");
case TIMED_FIELDS_END:
NOTREACHED();
- return TimedSigninStatusValue("Error", std::string());
+ return TimedSigninStatusValue("Error", "");
}
NOTREACHED();
- return TimedSigninStatusValue("Error", std::string());
+ return TimedSigninStatusValue("Error", "");
}
} // namespace
diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc
index ab5befc..a8bc081 100644
--- a/chrome/browser/signin/signin_manager.cc
+++ b/chrome/browser/signin/signin_manager.cc
@@ -305,9 +305,10 @@ std::string SigninManager::SigninTypeToString(
}
NOTREACHED();
- return std::string();
+ return "";
}
+
bool SigninManager::PrepareForSignin(SigninType type,
const std::string& username,
const std::string& password) {
@@ -467,8 +468,7 @@ void SigninManager::StartSignInWithOAuth(const std::string& username,
scopes.push_back(GaiaUrls::GetInstance()->oauth1_login_scope());
const std::string& locale = g_browser_process->GetApplicationLocale();
- client_login_->StartClientOAuth(
- username, password, scopes, std::string(), locale);
+ client_login_->StartClientOAuth(username, password, scopes, "", locale);
// Register for token availability. The signin manager will pre-login the
// user when the GAIA service token is ready for use. Only do this if we
@@ -549,9 +549,10 @@ void SigninManager::SignOut() {
profile_->GetPrefs()->ClearPref(prefs::kGoogleServicesUsername);
// Erase (now) stale information from AboutSigninInternals.
- NotifyDiagnosticsObservers(USERNAME, std::string());
- NotifyDiagnosticsObservers(LSID, std::string());
- NotifyDiagnosticsObservers(signin_internals_util::SID, std::string());
+ NotifyDiagnosticsObservers(USERNAME, "");
+ NotifyDiagnosticsObservers(LSID, "");
+ NotifyDiagnosticsObservers(
+ signin_internals_util::SID, "");
TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
content::NotificationService::current()->Notify(
diff --git a/chrome/browser/signin/signin_manager_factory.cc b/chrome/browser/signin/signin_manager_factory.cc
index 11dd5e6..67e33c0 100644
--- a/chrome/browser/signin/signin_manager_factory.cc
+++ b/chrome/browser/signin/signin_manager_factory.cc
@@ -39,11 +39,9 @@ SigninManagerFactory* SigninManagerFactory::GetInstance() {
}
void SigninManagerFactory::RegisterUserPrefs(PrefRegistrySyncable* registry) {
- registry->RegisterStringPref(prefs::kGoogleServicesLastUsername,
- std::string(),
+ registry->RegisterStringPref(prefs::kGoogleServicesLastUsername, "",
PrefRegistrySyncable::UNSYNCABLE_PREF);
- registry->RegisterStringPref(prefs::kGoogleServicesUsername,
- std::string(),
+ registry->RegisterStringPref(prefs::kGoogleServicesUsername, "",
PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterBooleanPref(prefs::kAutologinEnabled, true,
PrefRegistrySyncable::UNSYNCABLE_PREF);
@@ -56,8 +54,7 @@ void SigninManagerFactory::RegisterUserPrefs(PrefRegistrySyncable* registry) {
// static
void SigninManagerFactory::RegisterPrefs(PrefRegistrySimple* registry) {
- registry->RegisterStringPref(prefs::kGoogleServicesUsernamePattern,
- std::string());
+ registry->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, "");
}
ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor(
diff --git a/chrome/browser/signin/signin_manager_unittest.cc b/chrome/browser/signin/signin_manager_unittest.cc
index c49f7a1..79964d0 100644
--- a/chrome/browser/signin/signin_manager_unittest.cc
+++ b/chrome/browser/signin/signin_manager_unittest.cc
@@ -308,8 +308,7 @@ TEST_F(SigninManagerTest, SignInClientLogin) {
manager_->Initialize(profile_.get());
EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
- manager_->StartSignIn(
- "user@gmail.com", "password", std::string(), std::string());
+ manager_->StartSignIn("user@gmail.com", "password", "", "");
EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
SimulateValidResponseClientLogin(true);
@@ -341,7 +340,7 @@ TEST_F(SigninManagerTest, Prohibited) {
EXPECT_TRUE(manager_->IsAllowedUsername("happy@google.com"));
EXPECT_FALSE(manager_->IsAllowedUsername("test@invalid.com"));
EXPECT_FALSE(manager_->IsAllowedUsername("test@notgoogle.com"));
- EXPECT_FALSE(manager_->IsAllowedUsername(std::string()));
+ EXPECT_FALSE(manager_->IsAllowedUsername(""));
}
TEST_F(SigninManagerTest, TestAlternateWildcard) {
@@ -354,7 +353,7 @@ TEST_F(SigninManagerTest, TestAlternateWildcard) {
EXPECT_TRUE(manager_->IsAllowedUsername("happy@google.com"));
EXPECT_FALSE(manager_->IsAllowedUsername("test@invalid.com"));
EXPECT_FALSE(manager_->IsAllowedUsername("test@notgoogle.com"));
- EXPECT_FALSE(manager_->IsAllowedUsername(std::string()));
+ EXPECT_FALSE(manager_->IsAllowedUsername(""));
}
TEST_F(SigninManagerTest, ProhibitedAtStartup) {
@@ -422,7 +421,7 @@ TEST_F(SigninManagerTest, SignInWithCredentialsEmptyPasswordValidCookie) {
net::CookieMonster::SetCookiesCallback());
// Since the password is empty, will verify the gaia cookies first.
- manager_->StartSignInWithCredentials("0", "user@gmail.com", std::string());
+ manager_->StartSignInWithCredentials("0", "user@gmail.com", "");
WaitUntilUIDone();
@@ -435,7 +434,7 @@ TEST_F(SigninManagerTest, SignInWithCredentialsEmptyPasswordNoValidCookie) {
EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
// Since the password is empty, will verify the gaia cookies first.
- manager_->StartSignInWithCredentials("0", "user@gmail.com", std::string());
+ manager_->StartSignInWithCredentials("0", "user@gmail.com", "");
WaitUntilUIDone();
@@ -459,7 +458,7 @@ TEST_F(SigninManagerTest, SignInWithCredentialsEmptyPasswordInValidCookie) {
net::CookieMonster::SetCookiesCallback());
// Since the password is empty, must verify the gaia cookies first.
- manager_->StartSignInWithCredentials("0", "user@gmail.com", std::string());
+ manager_->StartSignInWithCredentials("0", "user@gmail.com", "");
WaitUntilUIDone();
@@ -472,7 +471,7 @@ TEST_F(SigninManagerTest, SignInClientLoginNoGPlus) {
manager_->Initialize(profile_.get());
EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
- manager_->StartSignIn("username", "password", std::string(), std::string());
+ manager_->StartSignIn("username", "password", "", "");
EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
SimulateValidResponseClientLogin(false);
@@ -483,7 +482,7 @@ TEST_F(SigninManagerTest, ClearTransientSigninData) {
manager_->Initialize(profile_.get());
EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
- manager_->StartSignIn("username", "password", std::string(), std::string());
+ manager_->StartSignIn("username", "password", "", "");
EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
SimulateValidResponseClientLogin(false);
@@ -514,7 +513,7 @@ TEST_F(SigninManagerTest, ClearTransientSigninData) {
TEST_F(SigninManagerTest, SignOutClientLogin) {
manager_->Initialize(profile_.get());
- manager_->StartSignIn("username", "password", std::string(), std::string());
+ manager_->StartSignIn("username", "password", "", "");
SimulateValidResponseClientLogin(false);
manager_->OnClientLoginSuccess(credentials_);
@@ -530,7 +529,7 @@ TEST_F(SigninManagerTest, SignOutClientLogin) {
TEST_F(SigninManagerTest, SignInFailureClientLogin) {
manager_->Initialize(profile_.get());
- manager_->StartSignIn("username", "password", std::string(), std::string());
+ manager_->StartSignIn("username", "password", "", "");
GoogleServiceAuthError error(GoogleServiceAuthError::REQUEST_CANCELED);
manager_->OnClientLoginFailure(error);
@@ -548,7 +547,7 @@ TEST_F(SigninManagerTest, SignInFailureClientLogin) {
TEST_F(SigninManagerTest, ProvideSecondFactorSuccess) {
manager_->Initialize(profile_.get());
- manager_->StartSignIn("username", "password", std::string(), std::string());
+ manager_->StartSignIn("username", "password", "", "");
GoogleServiceAuthError error(GoogleServiceAuthError::TWO_FACTOR);
manager_->OnClientLoginFailure(error);
@@ -567,7 +566,7 @@ TEST_F(SigninManagerTest, ProvideSecondFactorSuccess) {
TEST_F(SigninManagerTest, ProvideSecondFactorFailure) {
manager_->Initialize(profile_.get());
- manager_->StartSignIn("username", "password", std::string(), std::string());
+ manager_->StartSignIn("username", "password", "", "");
GoogleServiceAuthError error1(GoogleServiceAuthError::TWO_FACTOR);
manager_->OnClientLoginFailure(error1);
@@ -597,7 +596,7 @@ TEST_F(SigninManagerTest, ProvideSecondFactorFailure) {
TEST_F(SigninManagerTest, SignOutMidConnect) {
manager_->Initialize(profile_.get());
- manager_->StartSignIn("username", "password", std::string(), std::string());
+ manager_->StartSignIn("username", "password", "", "");
manager_->SignOut();
EXPECT_EQ(0U, google_login_success_.size());
EXPECT_EQ(0U, google_login_failure_.size());
diff --git a/chrome/browser/signin/token_service_unittest.cc b/chrome/browser/signin/token_service_unittest.cc
index fbe83df..617a394 100644
--- a/chrome/browser/signin/token_service_unittest.cc
+++ b/chrome/browser/signin/token_service_unittest.cc
@@ -225,7 +225,7 @@ TEST_F(TokenServiceTest, OnTokenSuccessUpdate) {
EXPECT_EQ(service_->GetTokenForService(GaiaConstants::kSyncService),
"token2");
- service_->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, std::string());
+ service_->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "");
EXPECT_TRUE(service_->HasTokenForService(GaiaConstants::kSyncService));
EXPECT_EQ(service_->GetTokenForService(GaiaConstants::kSyncService), "");
}
generated by cgit v1.1 at 2024-09-22 14:29:51 +0000