Add gaia_id to ProfileInfoCache.

chrome/browser/ui/webui/signin/inline_login_handler_impl.cc

 // Copyright 2013 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/ui/webui/signin/inline_login_handler_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 495 matching lines @@
         origin != kGaiaExtOrigin &&
         !gaia::IsGaiaSignonRealm(origin)) {
       confirm_untrusted_signin_ = true;
     }
   }
 }
 
 // static
 bool InlineLoginHandlerImpl::CanOffer(Profile* profile,
                                       CanOfferFor can_offer_for,
+                                      const std::string& gaia_id,
                                       const std::string& email,
                                       std::string* error_message) {
   if (error_message)
     error_message->clear();
 
   if (!profile)
     return false;
 
   SigninManager* manager = SigninManagerFactory::GetForProfile(profile);
   if (manager && !manager->IsSigninAllowed())
@@ skipping 35 matching lines @@
       return false;
     }
 
     // If some profile, not just the current one, is already connected to this
     // account, don't show the infobar.
     if (g_browser_process && !same_email) {
       ProfileManager* profile_manager = g_browser_process->profile_manager();
       if (profile_manager) {
         ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
         for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
+          // For backward compatibility, need to also check the UserName of the
+          // profile, since the GaiaId may not have been set yet for the
+          // profile cache info.  It will get set once the profile is opened.
+          std::string profile_gaia_id = cache.GetGAIAIdOfProfileAtIndex(i);
           std::string profile_email =
               base::UTF16ToUTF8(cache.GetUserNameOfProfileAtIndex(i));
-          if (gaia::AreEmailsSame(email, profile_email)) {
+          if (gaia_id == profile_gaia_id ||
+              gaia::AreEmailsSame(email, profile_email)) {
             if (error_message) {
               error_message->assign(
                   l10n_util::GetStringUTF8(IDS_SYNC_USER_NAME_IN_USE_ERROR));
             }
             return false;
           }
         }
       }
     }
   }
@@ skipping 94 matching lines @@
         can_offer_for = CAN_OFFER_FOR_SECONDARY_ACCOUNT;
       break;
     }
     default:
       // No need to change |can_offer_for|.
       break;
   }
 
   std::string error_msg;
   bool can_offer = CanOffer(Profile::FromWebUI(web_ui()), can_offer_for,
-      email, &error_msg);
+      gaia_id, email, &error_msg);
   if (!can_offer) {
     HandleLoginError(error_msg);
     return;
   }
 
   AboutSigninInternals* about_signin_internals =
       AboutSigninInternalsFactory::GetForProfile(Profile::FromWebUI(web_ui()));
   about_signin_internals->OnAuthenticationResultReceived("Successful");
 
   content::StoragePartition* partition =
@@ skipping 75 matching lines @@
       }
     }
 
     if (show_account_management) {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
             BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT,
             signin::ManageAccountsParams());
     }
   }
 }