From 1b5be2906a6e67caf902dab1ad1ff3df2b3b7a01 Mon Sep 17 00:00:00 2001 From: bzanotti Date: Mon, 31 Aug 2015 05:10:05 -0700 Subject: [PATCH] Change SigninManagerBase convenience method. The new GetAuthenticatedAccountInfo() returns an AccountInfo instead of just the email. Old code has been updated to use GetAuthenticatedAccountInfo().email. BUG= TBR=bauerb@chromium.org,kmadhusu@chromium.org,benwells@chromium.org,atwilson@chromium.org,dimich@chromium.org,anthonyvd@chromium.org,asargent@chromium.org Review URL: https://codereview.chromium.org/1306843005 Cr-Commit-Position: refs/heads/master@{#346374} --- .../enterprise_platform_keys_private_api.cc | 3 ++- .../feedback_private/feedback_private_api.cc | 2 +- .../search_engines_private_api.cc | 2 +- .../webstore_private/webstore_private_api.cc | 3 ++- .../browser/password_manager/sync_metrics.cc | 2 +- .../cloud/user_policy_signin_service.cc | 5 ++-- .../cloud/user_policy_signin_service_base.cc | 2 +- chrome/browser/profiles/profile_impl.cc | 2 +- .../services/gcm/fake_signin_manager.cc | 2 +- .../signin/chrome_proximity_auth_client.cc | 2 +- .../signin/easy_unlock_service_regular.cc | 3 ++- .../browser/signin/signin_manager_unittest.cc | 25 ++++++++++--------- chrome/browser/signin/signin_ui_util.cc | 2 +- .../supervised_user_service.cc | 5 ++-- chrome/browser/sync/about_sync_util.cc | 2 +- .../sync/profile_sync_service_android.cc | 4 ++- .../supervised_user_signin_manager_wrapper.cc | 2 +- chrome/browser/sync/sync_ui_util.cc | 4 +-- .../app_list/search/people/people_result.cc | 2 +- chrome/browser/ui/search/search_tab_helper.cc | 5 ++-- .../ui/webui/app_launcher_login_handler.cc | 5 ++-- .../local_discovery_ui_handler.cc | 2 +- .../ui/webui/ntp/new_tab_page_sync_handler.cc | 6 +++-- .../webui/options/browser_options_handler.cc | 3 ++- .../webui/options/manage_profile_handler.cc | 4 +-- .../supervised_user_create_confirm_handler.cc | 2 +- .../print_preview/print_preview_handler.cc | 2 +- .../browser/ui/webui/profile_info_watcher.cc | 2 +- .../webui/signin/inline_login_handler_impl.cc | 8 +++--- .../core/browser/about_signin_internals.cc | 2 +- .../core/browser/fake_signin_manager.cc | 2 +- .../core/browser/profile_identity_provider.cc | 2 +- .../signin/core/browser/signin_manager.cc | 20 ++++++--------- .../core/browser/signin_manager_base.cc | 5 ++-- .../signin/core/browser/signin_manager_base.h | 20 +++++++-------- 35 files changed, 87 insertions(+), 77 deletions(-) diff --git a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc index 8db319d9ca139a..004f4e138fb5e3 100644 --- a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc +++ b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc @@ -156,7 +156,8 @@ std::string EPKPChallengeKeyBase::GetUserEmail() const { if (!signin_manager) return std::string(); - return gaia::CanonicalizeEmail(signin_manager->GetAuthenticatedUsername()); + return gaia::CanonicalizeEmail( + signin_manager->GetAuthenticatedAccountInfo().email); } std::string EPKPChallengeKeyBase::GetDeviceId() const { diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc index ae82f7a2181ea8..4a6f81ef2b0a62 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc @@ -142,7 +142,7 @@ bool FeedbackPrivateGetUserEmailFunction::RunSync() { SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfile(GetProfile()); SetResult(new base::StringValue( - signin_manager ? signin_manager->GetAuthenticatedUsername() + signin_manager ? signin_manager->GetAuthenticatedAccountInfo().email : std::string())); return true; } diff --git a/chrome/browser/extensions/api/search_engines_private/search_engines_private_api.cc b/chrome/browser/extensions/api/search_engines_private/search_engines_private_api.cc index 3e23b25251529e..c5c8286ed5c9a6 100644 --- a/chrome/browser/extensions/api/search_engines_private/search_engines_private_api.cc +++ b/chrome/browser/extensions/api/search_engines_private/search_engines_private_api.cc @@ -251,7 +251,7 @@ SearchEnginesPrivateGetHotwordStateFunction::Run() { // in, audio history is meaningless. This is only displayed if always-on // hotwording is available. if (authenticated && always_on) { - std::string user_display_name = signin->GetAuthenticatedUsername(); + std::string user_display_name = signin->GetAuthenticatedAccountInfo().email; HotwordService* hotword_service = HotwordServiceFactory::GetForProfile(profile); if (hotword_service) { diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 9013329bf2cf99..7cc4b56f726871 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc @@ -648,7 +648,8 @@ WebstorePrivateGetBrowserLoginFunction::Run() { GetBrowserLogin::Results::Info info; info.login = SigninManagerFactory::GetForProfile( chrome_details_.GetProfile()->GetOriginalProfile()) - ->GetAuthenticatedUsername(); + ->GetAuthenticatedAccountInfo() + .email; return RespondNow(ArgumentList(GetBrowserLogin::Results::Create(info))); } diff --git a/chrome/browser/password_manager/sync_metrics.cc b/chrome/browser/password_manager/sync_metrics.cc index 0ae0cf75e16575..031408743d6709 100644 --- a/chrome/browser/password_manager/sync_metrics.cc +++ b/chrome/browser/password_manager/sync_metrics.cc @@ -28,7 +28,7 @@ std::string GetSyncUsername(Profile* profile) { if (!signin_manager) return std::string(); - return signin_manager->GetAuthenticatedUsername(); + return signin_manager->GetAuthenticatedAccountInfo().email; } bool IsSyncAccountCredential(Profile* profile, diff --git a/chrome/browser/policy/cloud/user_policy_signin_service.cc b/chrome/browser/policy/cloud/user_policy_signin_service.cc index 685278fa323542..3e6139db75af9b 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service.cc @@ -127,8 +127,9 @@ void UserPolicySigninService::OnRefreshTokenAvailable( // ProfileOAuth2TokenService now has a refresh token so initialize the // UserCloudPolicyManager. - InitializeForSignedInUser(signin_manager()->GetAuthenticatedUsername(), - profile_->GetRequestContext()); + InitializeForSignedInUser( + signin_manager()->GetAuthenticatedAccountInfo().email, + profile_->GetRequestContext()); } void UserPolicySigninService::InitializeUserCloudPolicyManager( diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_base.cc b/chrome/browser/policy/cloud/user_policy_signin_service_base.cc index 581ff3c828e55f..df3abca64e08cf 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_base.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_base.cc @@ -192,7 +192,7 @@ void UserPolicySigninServiceBase::InitializeOnProfileReady(Profile* profile) { // (http://crbug.com/316229). signin_manager()->AddObserver(this); - std::string username = signin_manager()->GetAuthenticatedUsername(); + std::string username = signin_manager()->GetAuthenticatedAccountInfo().email; if (username.empty()) ShutdownUserCloudPolicyManager(); else diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 204cf03774edd3..dc1d34549376c1 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -700,7 +700,7 @@ std::string ProfileImpl::GetProfileUserName() const { const SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfileIfExists(this); if (signin_manager) - return signin_manager->GetAuthenticatedUsername(); + return signin_manager->GetAuthenticatedAccountInfo().email; return std::string(); } diff --git a/chrome/browser/services/gcm/fake_signin_manager.cc b/chrome/browser/services/gcm/fake_signin_manager.cc index 563ee4f9934180..36e17025c54a5c 100644 --- a/chrome/browser/services/gcm/fake_signin_manager.cc +++ b/chrome/browser/services/gcm/fake_signin_manager.cc @@ -51,7 +51,7 @@ void FakeSigninManager::SignIn(const std::string& account_id) { void FakeSigninManager::SignOut( signin_metrics::ProfileSignout signout_source_metric) { const std::string account_id = GetAuthenticatedAccountId(); - const std::string username = GetAuthenticatedUsername(); + const std::string username = GetAuthenticatedAccountInfo().email; clear_authenticated_user(); profile_->GetPrefs()->ClearPref(prefs::kGoogleServicesAccountId); FOR_EACH_OBSERVER(SigninManagerBase::Observer, diff --git a/chrome/browser/signin/chrome_proximity_auth_client.cc b/chrome/browser/signin/chrome_proximity_auth_client.cc index b43ebe34aece73..87aa615d2d16ab 100644 --- a/chrome/browser/signin/chrome_proximity_auth_client.cc +++ b/chrome/browser/signin/chrome_proximity_auth_client.cc @@ -41,7 +41,7 @@ std::string ChromeProximityAuthClient::GetAuthenticatedUsername() const { // |profile_| has to be a signed-in profile with SigninManager already // created. Otherwise, just crash to collect stack. DCHECK(signin_manager); - return signin_manager->GetAuthenticatedUsername(); + return signin_manager->GetAuthenticatedAccountInfo().email; } void ChromeProximityAuthClient::UpdateScreenlockState(ScreenlockState state) { diff --git a/chrome/browser/signin/easy_unlock_service_regular.cc b/chrome/browser/signin/easy_unlock_service_regular.cc index 304f700c485957..5ed07966f21798 100644 --- a/chrome/browser/signin/easy_unlock_service_regular.cc +++ b/chrome/browser/signin/easy_unlock_service_regular.cc @@ -69,7 +69,8 @@ std::string EasyUnlockServiceRegular::GetUserEmail() const { // |profile| has to be a signed-in profile with SigninManager already // created. Otherwise, just crash to collect stack. DCHECK(signin_manager); - const std::string user_email = signin_manager->GetAuthenticatedUsername(); + const std::string user_email = + signin_manager->GetAuthenticatedAccountInfo().email; return user_email.empty() ? user_email : gaia::CanonicalizeEmail(user_email); } diff --git a/chrome/browser/signin/signin_manager_unittest.cc b/chrome/browser/signin/signin_manager_unittest.cc index d82e8d14b2b1d9..745e1bad7ed1c2 100644 --- a/chrome/browser/signin/signin_manager_unittest.cc +++ b/chrome/browser/signin/signin_manager_unittest.cc @@ -198,7 +198,7 @@ class SigninManagerTest : public testing::Test { void ExpectSignInWithRefreshTokenSuccess() { EXPECT_TRUE(manager_->IsAuthenticated()); EXPECT_FALSE(manager_->GetAuthenticatedAccountId().empty()); - EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty()); + EXPECT_FALSE(manager_->GetAuthenticatedAccountInfo().email.empty()); ProfileOAuth2TokenService* token_service = ProfileOAuth2TokenServiceFactory::GetForProfile(profile()); @@ -315,21 +315,21 @@ TEST_F(SigninManagerTest, SignOut) { SigninManager::OAuthTokenFetchedCallback()); manager_->SignOut(signin_metrics::SIGNOUT_TEST); EXPECT_FALSE(manager_->IsAuthenticated()); - EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty()); + EXPECT_TRUE(manager_->GetAuthenticatedAccountInfo().email.empty()); EXPECT_TRUE(manager_->GetAuthenticatedAccountId().empty()); // Should not be persisted anymore ShutDownManager(); CreateNakedSigninManager(); manager_->Initialize(NULL); EXPECT_FALSE(manager_->IsAuthenticated()); - EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty()); + EXPECT_TRUE(manager_->GetAuthenticatedAccountInfo().email.empty()); EXPECT_TRUE(manager_->GetAuthenticatedAccountId().empty()); } TEST_F(SigninManagerTest, SignOutWhileProhibited) { SetUpSigninManagerAsService(); EXPECT_FALSE(manager_->IsAuthenticated()); - EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty()); + EXPECT_TRUE(manager_->GetAuthenticatedAccountInfo().email.empty()); EXPECT_TRUE(manager_->GetAuthenticatedAccountId().empty()); manager_->SetAuthenticatedAccountInfo("gaia_id", "user@gmail.com"); @@ -375,7 +375,7 @@ TEST_F(SigninManagerTest, ProhibitedAtStartup) { CreateNakedSigninManager(); manager_->Initialize(g_browser_process->local_state()); // Currently signed in user is prohibited by policy, so should be signed out. - EXPECT_EQ("", manager_->GetAuthenticatedUsername()); + EXPECT_EQ("", manager_->GetAuthenticatedAccountInfo().email); EXPECT_EQ("", manager_->GetAuthenticatedAccountId()); } @@ -384,19 +384,19 @@ TEST_F(SigninManagerTest, ProhibitedAfterStartup) { profile()->GetPrefs()->SetString(prefs::kGoogleServicesAccountId, account_id); CreateNakedSigninManager(); manager_->Initialize(g_browser_process->local_state()); - EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername()); + EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedAccountInfo().email); EXPECT_EQ(account_id, manager_->GetAuthenticatedAccountId()); // Update the profile - user should be signed out. g_browser_process->local_state()->SetString( prefs::kGoogleServicesUsernamePattern, ".*@google.com"); - EXPECT_EQ("", manager_->GetAuthenticatedUsername()); + EXPECT_EQ("", manager_->GetAuthenticatedAccountInfo().email); EXPECT_EQ("", manager_->GetAuthenticatedAccountId()); } TEST_F(SigninManagerTest, ExternalSignIn) { CreateNakedSigninManager(); manager_->Initialize(g_browser_process->local_state()); - EXPECT_EQ("", manager_->GetAuthenticatedUsername()); + EXPECT_EQ("", manager_->GetAuthenticatedAccountInfo().email); EXPECT_EQ("", manager_->GetAuthenticatedAccountId()); EXPECT_EQ(0, test_observer_.num_successful_signins_); @@ -404,7 +404,7 @@ TEST_F(SigninManagerTest, ExternalSignIn) { manager_->OnExternalSigninCompleted("user@gmail.com"); EXPECT_EQ(1, test_observer_.num_successful_signins_); EXPECT_EQ(0, test_observer_.num_failed_signins_); - EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername()); + EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedAccountInfo().email); EXPECT_EQ(account_id, manager_->GetAuthenticatedAccountId()); } @@ -416,7 +416,7 @@ TEST_F(SigninManagerTest, SigninNotAllowed) { AddToAccountTracker("gaia_id", user); manager_->Initialize(g_browser_process->local_state()); // Currently signing in is prohibited by policy, so should be signed out. - EXPECT_EQ("", manager_->GetAuthenticatedUsername()); + EXPECT_EQ("", manager_->GetAuthenticatedAccountInfo().email); EXPECT_EQ("", manager_->GetAuthenticatedAccountId()); } @@ -427,7 +427,7 @@ TEST_F(SigninManagerTest, UpgradeToNewPrefs) { "account_id"); CreateNakedSigninManager(); manager_->Initialize(g_browser_process->local_state()); - EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername()); + EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedAccountInfo().email); AccountTrackerService* service = AccountTrackerServiceFactory::GetForProfile(profile()); @@ -465,7 +465,8 @@ TEST_F(SigninManagerTest, CanonicalizesPrefs) { CreateNakedSigninManager(); manager_->Initialize(g_browser_process->local_state()); - EXPECT_EQ("user.C@gmail.com", manager_->GetAuthenticatedUsername()); + EXPECT_EQ("user.C@gmail.com", + manager_->GetAuthenticatedAccountInfo().email); // TODO(rogerta): until the migration to gaia id, the account id will remain // the old username. diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc index a5ed1122b1c59a..563bef921a6546 100644 --- a/chrome/browser/signin/signin_ui_util.cc +++ b/chrome/browser/signin/signin_ui_util.cc @@ -84,7 +84,7 @@ base::string16 GetSigninMenuLabel(Profile* profile) { SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfileIfExists(profile); if (signin_manager) - username = signin_manager->GetAuthenticatedUsername(); + username = signin_manager->GetAuthenticatedAccountInfo().email; if (!username.empty() && !signin_manager->AuthInProgress()) { const base::string16 elided = gfx::ElideText(base::UTF8ToUTF16(username), gfx::FontList(), kUsernameMaxWidth, gfx::ELIDE_EMAIL); diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc index e1529e2d458025..74f18d1966d113 100644 --- a/chrome/browser/supervised_user/supervised_user_service.cc +++ b/chrome/browser/supervised_user/supervised_user_service.cc @@ -890,8 +890,9 @@ void SupervisedUserService::OnSupervisedUserRegistered( InitSync(token); SigninManagerBase* signin = SigninManagerFactory::GetForProfile(custodian_profile); - profile_->GetPrefs()->SetString(prefs::kSupervisedUserCustodianEmail, - signin->GetAuthenticatedUsername()); + profile_->GetPrefs()->SetString( + prefs::kSupervisedUserCustodianEmail, + signin->GetAuthenticatedAccountInfo().email); // The supervised user profile is now ready for use. ProfileManager* profile_manager = g_browser_process->profile_manager(); diff --git a/chrome/browser/sync/about_sync_util.cc b/chrome/browser/sync/about_sync_util.cc index 04a2a3045f9125..7a409584fc9026 100644 --- a/chrome/browser/sync/about_sync_util.cc +++ b/chrome/browser/sync/about_sync_util.cc @@ -336,7 +336,7 @@ scoped_ptr ConstructAboutInformation( if (is_status_valid && !full_status.invalidator_client_id.empty()) invalidator_id.SetValue(full_status.invalidator_client_id); if (service->signin()) - username.SetValue(service->signin()->GetAuthenticatedUsername()); + username.SetValue(service->signin()->GetAuthenticatedAccountInfo().email); const ProfileSyncService::SyncTokenStatus& token_status = service->GetSyncTokenStatus(); diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc index 1be276e4d07771..973d5af12e47a4 100644 --- a/chrome/browser/sync/profile_sync_service_android.cc +++ b/chrome/browser/sync/profile_sync_service_android.cc @@ -309,7 +309,9 @@ ScopedJavaLocalRef JNIEnv* env, jobject) { DCHECK_CURRENTLY_ON(BrowserThread::UI); const std::string& sync_username = - SigninManagerFactory::GetForProfile(profile_)->GetAuthenticatedUsername(); + SigninManagerFactory::GetForProfile(profile_) + ->GetAuthenticatedAccountInfo() + .email; return base::android::ConvertUTF16ToJavaString(env, l10n_util::GetStringFUTF16( IDS_SYNC_ACCOUNT_SYNCING_TO_USER, diff --git a/chrome/browser/sync/supervised_user_signin_manager_wrapper.cc b/chrome/browser/sync/supervised_user_signin_manager_wrapper.cc index 1c931a0bfa9143..dec6b3b9534d26 100644 --- a/chrome/browser/sync/supervised_user_signin_manager_wrapper.cc +++ b/chrome/browser/sync/supervised_user_signin_manager_wrapper.cc @@ -29,7 +29,7 @@ std::string SupervisedUserSigninManagerWrapper::GetEffectiveUsername() const { if (profile_->IsLegacySupervised()) return supervised_users::kSupervisedUserPseudoEmail; #endif - return original_->GetAuthenticatedUsername(); + return original_->GetAuthenticatedAccountInfo().email; } std::string SupervisedUserSigninManagerWrapper::GetAccountIdToUse() const { diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index f686a3057493be..3945ff8122cb9a 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -56,7 +56,7 @@ bool IsChromeDashboardEnabled() { base::string16 GetSyncedStateStatusLabel(ProfileSyncService* service, const SigninManagerBase& signin, StatusLabelStyle style) { - std::string user_display_name = signin.GetAuthenticatedUsername(); + std::string user_display_name = signin.GetAuthenticatedAccountInfo().email; #if defined(OS_CHROMEOS) if (user_manager::UserManager::IsInitialized()) { @@ -280,7 +280,7 @@ MessageType GetStatusInfo(ProfileSyncService* service, if (status_label) { base::string16 label = l10n_util::GetStringFUTF16( IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED, - base::UTF8ToUTF16(signin.GetAuthenticatedUsername())); + base::UTF8ToUTF16(signin.GetAuthenticatedAccountInfo().email)); status_label->assign(label); result_type = PRE_SYNCED; } diff --git a/chrome/browser/ui/app_list/search/people/people_result.cc b/chrome/browser/ui/app_list/search/people/people_result.cc index 4977d60848bea6..ab748320549aa4 100644 --- a/chrome/browser/ui/app_list/search/people/people_result.cc +++ b/chrome/browser/ui/app_list/search/people/people_result.cc @@ -160,7 +160,7 @@ void PeopleResult::OpenChat() { SigninManagerBase* signin_manager = SigninManagerFactory::GetInstance()->GetForProfile(profile_); DCHECK(signin_manager); - request.from = signin_manager->GetAuthenticatedUsername(); + request.from = signin_manager->GetAuthenticatedAccountInfo().email; // to: list of users with whom to start this hangout is with. linked_ptr target(new User()); diff --git a/chrome/browser/ui/search/search_tab_helper.cc b/chrome/browser/ui/search/search_tab_helper.cc index 1b395341fa42ce..88892381573614 100644 --- a/chrome/browser/ui/search/search_tab_helper.cc +++ b/chrome/browser/ui/search/search_tab_helper.cc @@ -530,8 +530,9 @@ void SearchTabHelper::OnChromeIdentityCheck(const base::string16& identity) { SigninManagerBase* manager = SigninManagerFactory::GetForProfile(profile()); if (manager) { ipc_router_.SendChromeIdentityCheckResult( - identity, gaia::AreEmailsSame(base::UTF16ToUTF8(identity), - manager->GetAuthenticatedUsername())); + identity, + gaia::AreEmailsSame(base::UTF16ToUTF8(identity), + manager->GetAuthenticatedAccountInfo().email)); } else { ipc_router_.SendChromeIdentityCheckResult(identity, false); } diff --git a/chrome/browser/ui/webui/app_launcher_login_handler.cc b/chrome/browser/ui/webui/app_launcher_login_handler.cc index 3d4d3553622e2b..1f33e8904f71a4 100644 --- a/chrome/browser/ui/webui/app_launcher_login_handler.cc +++ b/chrome/browser/ui/webui/app_launcher_login_handler.cc @@ -114,8 +114,9 @@ void AppLauncherLoginHandler::HandleShowSyncLoginUI( if (!signin::ShouldShowPromo(profile)) return; - std::string username = - SigninManagerFactory::GetForProfile(profile)->GetAuthenticatedUsername(); + std::string username = SigninManagerFactory::GetForProfile(profile) + ->GetAuthenticatedAccountInfo() + .email; if (!username.empty()) return; diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc index 5c32f9a6871788..ce801c85e05026 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc @@ -464,7 +464,7 @@ std::string LocalDiscoveryUIHandler::GetSyncAccount() { return ""; } - return signin_manager->GetAuthenticatedUsername(); + return signin_manager->GetAuthenticatedAccountInfo().email; } // TODO(noamsml): Create master object for registration flow. diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc index 915452d4f98958..8fc8ff12182422 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc @@ -134,8 +134,10 @@ void NewTabPageSyncHandler::HandleSyncLinkClicked(const base::ListValue* args) { chrome::ShowBrowserSignin(browser, signin_metrics::SOURCE_NTP_LINK); if (sync_service_->HasSyncSetupCompleted()) { - base::string16 user = base::UTF8ToUTF16(SigninManagerFactory::GetForProfile( - Profile::FromWebUI(web_ui()))->GetAuthenticatedUsername()); + base::string16 user = base::UTF8ToUTF16( + SigninManagerFactory::GetForProfile(Profile::FromWebUI(web_ui())) + ->GetAuthenticatedAccountInfo() + .email); base::DictionaryValue value; value.SetString("syncEnabledMessage", l10n_util::GetStringFUTF16(IDS_SYNC_NTP_SYNCED_TO, diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 015cf85191b75e..ec6eaab35ef3dd 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -1817,7 +1817,8 @@ void BrowserOptionsHandler::HandleRequestHotwordAvailable( // in, audio history is meaningless. This is only displayed if always-on // hotwording is available. if (authenticated && always_on) { - std::string user_display_name = signin->GetAuthenticatedUsername(); + std::string user_display_name = + signin->GetAuthenticatedAccountInfo().email; DCHECK(!user_display_name.empty()); base::string16 audio_history_state = l10n_util::GetStringFUTF16(IDS_HOTWORD_AUDIO_HISTORY_ENABLED, diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc index f4be2b7cdd0582..056c20c5bfd704 100644 --- a/chrome/browser/ui/webui/options/manage_profile_handler.cc +++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc @@ -243,7 +243,7 @@ void ManageProfileHandler::GenerateSignedinUserSpecificStrings( DCHECK(profile); SigninManagerBase* manager = SigninManagerFactory::GetForProfile(profile); if (manager) { - username = manager->GetAuthenticatedUsername(); + username = manager->GetAuthenticatedAccountInfo().email; // If there is no one logged in or if the profile name is empty then the // domain name is empty. This happens in browser tests. if (!username.empty()) { @@ -496,7 +496,7 @@ void ManageProfileHandler::RequestCreateProfileUpdate( SigninManagerBase* manager = SigninManagerFactory::GetForProfile(profile); base::string16 username = - base::UTF8ToUTF16(manager->GetAuthenticatedUsername()); + base::UTF8ToUTF16(manager->GetAuthenticatedAccountInfo().email); ProfileSyncService* service = ProfileSyncServiceFactory::GetForProfile(profile); GoogleServiceAuthError::State state = GoogleServiceAuthError::NONE; diff --git a/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc b/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc index c37010ea1f0aa9..9c889a9b5a4d33 100644 --- a/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc +++ b/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc @@ -114,7 +114,7 @@ void SupervisedUserCreateConfirmHandler::GetLocalizedValues( SigninManagerFactory::GetForProfile(Profile::FromWebUI(web_ui())); if (signin) { localized_strings->SetString("custodianEmail", - signin->GetAuthenticatedUsername()); + signin->GetAuthenticatedAccountInfo().email); } else { localized_strings->SetString("custodianEmail", std::string()); } diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index 266384fc017937..67365a44f2d2a2 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -1629,7 +1629,7 @@ void PrintPreviewHandler::StartPrivetLocalPrint(const std::string& print_ticket, if (signin_manager) { privet_local_print_operation_->SetUsername( - signin_manager->GetAuthenticatedUsername()); + signin_manager->GetAuthenticatedAccountInfo().email); } privet_local_print_operation_->Start(); diff --git a/chrome/browser/ui/webui/profile_info_watcher.cc b/chrome/browser/ui/webui/profile_info_watcher.cc index a85ea12b4a16a0..18c9b9ef1ba36b 100644 --- a/chrome/browser/ui/webui/profile_info_watcher.cc +++ b/chrome/browser/ui/webui/profile_info_watcher.cc @@ -46,7 +46,7 @@ std::string ProfileInfoWatcher::GetAuthenticatedUsername() const { std::string username; SigninManagerBase* signin_manager = GetSigninManager(); if (signin_manager) - username = signin_manager->GetAuthenticatedUsername(); + username = signin_manager->GetAuthenticatedAccountInfo().email; return username; } diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc index 83ee8f9c0f516d..5d2b39aed33338 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc @@ -319,7 +319,8 @@ void InlineSigninHelper::OnClientOAuthSuccess(const ClientOAuthResult& result) { signin_metrics::Source source = signin::GetSourceForPromoURL(current_url_); SigninManager* signin_manager = SigninManagerFactory::GetForProfile(profile_); - std::string primary_email = signin_manager->GetAuthenticatedUsername(); + std::string primary_email = + signin_manager->GetAuthenticatedAccountInfo().email; if (gaia::AreEmailsSame(email_, primary_email) && source == signin_metrics::SOURCE_REAUTH && switches::IsNewProfileManagement() && @@ -552,7 +553,7 @@ bool InlineLoginHandlerImpl::CanOffer(Profile* profile, // If the signin manager already has an authenticated name, then this is a // re-auth scenario. Make sure the email just signed in corresponds to // the one sign in manager expects. - std::string current_email = manager->GetAuthenticatedUsername(); + std::string current_email = manager->GetAuthenticatedAccountInfo().email; const bool same_email = gaia::AreEmailsSame(current_email, email); if (!current_email.empty() && !same_email) { UMA_HISTOGRAM_ENUMERATION("Signin.Reauth", @@ -750,7 +751,8 @@ void InlineLoginHandlerImpl::FinishCompleteLogin( case signin_metrics::SOURCE_REAUTH: { std::string primary_username = SigninManagerFactory::GetForProfile(profile) - ->GetAuthenticatedUsername(); + ->GetAuthenticatedAccountInfo() + .email; if (!gaia::AreEmailsSame(default_email, primary_username)) can_offer_for = CAN_OFFER_FOR_SECONDARY_ACCOUNT; break; diff --git a/components/signin/core/browser/about_signin_internals.cc b/components/signin/core/browser/about_signin_internals.cc index 4b0edb02b2bbfb..1e2c98212babf5 100644 --- a/components/signin/core/browser/about_signin_internals.cc +++ b/components/signin/core/browser/about_signin_internals.cc @@ -541,7 +541,7 @@ scoped_ptr AboutSigninInternals::SigninStatus::ToValue( AddSectionEntry(basic_info, SigninStatusFieldToLabel( static_cast(USERNAME)), - signin_manager->GetAuthenticatedUsername()); + signin_manager->GetAuthenticatedAccountInfo().email); if (signin_error_controller->HasError()) { const std::string error_account_id = signin_error_controller->error_account_id(); diff --git a/components/signin/core/browser/fake_signin_manager.cc b/components/signin/core/browser/fake_signin_manager.cc index c1d4de547dc582..ee18b8dd95a53e 100644 --- a/components/signin/core/browser/fake_signin_manager.cc +++ b/components/signin/core/browser/fake_signin_manager.cc @@ -78,7 +78,7 @@ void FakeSigninManager::SignOut( set_auth_in_progress(std::string()); set_password(std::string()); const std::string account_id = GetAuthenticatedAccountId(); - const std::string username = GetAuthenticatedUsername(); + const std::string username = GetAuthenticatedAccountInfo().email; authenticated_account_id_.clear(); FOR_EACH_OBSERVER(SigninManagerBase::Observer, observer_list_, diff --git a/components/signin/core/browser/profile_identity_provider.cc b/components/signin/core/browser/profile_identity_provider.cc index b22e6940b8848d..3be796e2d64e3f 100644 --- a/components/signin/core/browser/profile_identity_provider.cc +++ b/components/signin/core/browser/profile_identity_provider.cc @@ -22,7 +22,7 @@ ProfileIdentityProvider::~ProfileIdentityProvider() { } std::string ProfileIdentityProvider::GetActiveUsername() { - return signin_manager_->GetAuthenticatedUsername(); + return signin_manager_->GetAuthenticatedAccountInfo().email; } std::string ProfileIdentityProvider::GetActiveAccountId() { diff --git a/components/signin/core/browser/signin_manager.cc b/components/signin/core/browser/signin_manager.cc index c73776ac2c56fe..f860777187eb4c 100644 --- a/components/signin/core/browser/signin_manager.cc +++ b/components/signin/core/browser/signin_manager.cc @@ -176,7 +176,7 @@ void SigninManager::SignOut( ClearTransientSigninData(); const std::string account_id = GetAuthenticatedAccountId(); - const std::string username = GetAuthenticatedUsername(); + const std::string username = GetAuthenticatedAccountInfo().email; const base::Time signin_time = base::Time::FromInternalValue( client_->GetPrefs()->GetInt64(prefs::kSignedInTime)); @@ -247,7 +247,8 @@ void SigninManager::Shutdown() { } void SigninManager::OnGoogleServicesUsernamePatternChanged() { - if (IsAuthenticated() && !IsAllowedUsername(GetAuthenticatedUsername())) { + if (IsAuthenticated() && + !IsAllowedUsername(GetAuthenticatedAccountInfo().email)) { // Signed in user is invalid according to the current policy so sign // the user out. SignOut(signin_metrics::GOOGLE_SERVICE_NAME_PATTERN_CHANGED); @@ -371,16 +372,12 @@ void SigninManager::OnSignedIn() { signin_manager_signed_in_ = true; FOR_EACH_OBSERVER( - SigninManagerBase::Observer, - observer_list_, + SigninManagerBase::Observer, observer_list_, GoogleSigninSucceeded(GetAuthenticatedAccountId(), - GetAuthenticatedUsername(), - password_)); + GetAuthenticatedAccountInfo().email, password_)); - client_->OnSignedIn(GetAuthenticatedAccountId(), - gaia_id, - GetAuthenticatedUsername(), - password_); + client_->OnSignedIn(GetAuthenticatedAccountId(), gaia_id, + GetAuthenticatedAccountInfo().email, password_); signin_metrics::LogSigninProfile(client_->IsFirstRun(), client_->GetInstallDate()); @@ -395,8 +392,7 @@ void SigninManager::PostSignedIn() { return; client_->PostSignedIn(GetAuthenticatedAccountId(), - GetAuthenticatedUsername(), - password_); + GetAuthenticatedAccountInfo().email, password_); password_.clear(); } diff --git a/components/signin/core/browser/signin_manager_base.cc b/components/signin/core/browser/signin_manager_base.cc index 27a94e8e443f8a..f18f009081621c 100644 --- a/components/signin/core/browser/signin_manager_base.cc +++ b/components/signin/core/browser/signin_manager_base.cc @@ -158,9 +158,8 @@ bool SigninManagerBase::IsSigninAllowed() const { return client_->GetPrefs()->GetBoolean(prefs::kSigninAllowed); } -std::string SigninManagerBase::GetAuthenticatedUsername() const { - return account_tracker_service_->GetAccountInfo( - GetAuthenticatedAccountId()).email; +AccountInfo SigninManagerBase::GetAuthenticatedAccountInfo() const { + return account_tracker_service_->GetAccountInfo(GetAuthenticatedAccountId()); } const std::string& SigninManagerBase::GetAuthenticatedAccountId() const { diff --git a/components/signin/core/browser/signin_manager_base.h b/components/signin/core/browser/signin_manager_base.h index ff7364f3c700e2..ba0ef25213e3fd 100644 --- a/components/signin/core/browser/signin_manager_base.h +++ b/components/signin/core/browser/signin_manager_base.h @@ -33,6 +33,7 @@ #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_member.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/signin/core/browser/account_info.h" #include "components/signin/core/browser/signin_internals_util.h" #include "google_apis/gaia/google_service_auth_error.h" @@ -88,9 +89,8 @@ class SigninManagerBase : public KeyedService { virtual bool IsSigninAllowed() const; // If a user has previously signed in (and has not signed out), this returns - // the normalized email address of the account. Otherwise, it returns an empty - // string. - std::string GetAuthenticatedUsername() const; + // the know information of the account. Otherwise, it returns an empty struct. + AccountInfo GetAuthenticatedAccountInfo() const; // If a user has previously signed in (and has not signed out), this returns // the account id. Otherwise, it returns an empty string. This id can be used @@ -99,13 +99,13 @@ class SigninManagerBase : public KeyedService { // // TODO(rogerta): eventually the account id should be an obfuscated gaia id. // For now though, this function returns the same value as - // GetAuthenticatedUsername() since lots of code assumes the unique id for an - // account is the username. For code that needs a unique id to represent the - // connected account, call this method. Example: the AccountInfoMap type - // in MutableProfileOAuth2TokenService. For code that needs to know the - // normalized email address of the connected account, use - // GetAuthenticatedUsername(). Example: to show the string "Signed in as XXX" - // in the hotdog menu. + // GetAuthenticatedAccountInfo().email since lots of code assumes the unique + // id for an account is the username. For code that needs a unique id to + // represent the connected account, call this method. Example: the + // AccountStatusMap type in MutableProfileOAuth2TokenService. For code that + // needs to know the normalized email address of the connected account, use + // GetAuthenticatedAccountInfo().email. Example: to show the string "Signed + // in as XXX" in the hotdog menu. const std::string& GetAuthenticatedAccountId() const; // Sets the authenticated user's Gaia ID and display email. Internally,