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}

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 {

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;
 }

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) {

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)));
 }
 

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,

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(

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

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();
 }

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,

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) {

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);
 }
 

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,27 +384,27 @@ 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_);
 
   std::string account_id = AddToAccountTracker("gaia_id", "user@gmail.com");
   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.

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);

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();

chrome/browser/sync/about_sync_util.cc

@@ -336,7 +336,7 @@ scoped_ptr<base::DictionaryValue> 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();

chrome/browser/sync/profile_sync_service_android.cc

@@ -309,7 +309,9 @@ ScopedJavaLocalRef<jstring>
         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,

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 {

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;
       }

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<User> target(new User());

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);
   }

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;
 

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.

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,

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,

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;

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());
   }

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();

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;
 }