Add gaia_id to ProfileInfoCache.

chrome/browser/signin/chrome_signin_client.cc

 // Copyright 2014 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/signin/chrome_signin_client.h"
 
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 119 matching lines @@
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   size_t index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
 
   // If sign out occurs because Sync setup was in progress and the Profile got
   // deleted, then the profile's no longer in the ProfileInfoCache.
   if (index == std::string::npos)
     return;
 
   cache.SetLocalAuthCredentialsOfProfileAtIndex(index, std::string());
-  cache.SetUserNameOfProfileAtIndex(index, base::string16());
+  cache.SetAuthInfoOfProfileAtIndex(index, std::string(), base::string16());
   cache.SetProfileSigninRequiredAtIndex(index, false);
 }
 
 net::URLRequestContextGetter* ChromeSigninClient::GetURLRequestContext() {
   return profile_->GetRequestContext();
 }
 
 bool ChromeSigninClient::ShouldMergeSigninCredentialsIntoCookieJar() {
   return !switches::IsEnableAccountConsistency();
 }
@@ skipping 37 matching lines @@
     const net::CookieStore::CookieChangedCallback& callback) {
   scoped_refptr<net::URLRequestContextGetter> context_getter =
       profile_->GetRequestContext();
   DCHECK(context_getter.get());
   scoped_ptr<SigninCookieChangedSubscription> subscription(
       new SigninCookieChangedSubscription(context_getter, url, name, callback));
   return subscription.Pass();
 }
 
 void ChromeSigninClient::OnSignedIn(const std::string& account_id,
+                                    const std::string& gaia_id,
                                     const std::string& username,
                                     const std::string& password) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   size_t index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
   if (index != std::string::npos) {
-    cache.SetUserNameOfProfileAtIndex(index, base::UTF8ToUTF16(username));
+    cache.SetAuthInfoOfProfileAtIndex(index, gaia_id,
+                                      base::UTF8ToUTF16(username));
     ProfileMetrics::UpdateReportedProfilesStatistics(profile_manager);
   }
 }
 
 void ChromeSigninClient::PostSignedIn(const std::string& account_id,
                                       const std::string& username,
                                       const std::string& password) {
 #if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_CHROMEOS)
   // Don't store password hash except when lock is available for the user.
   if (!password.empty() && profiles::IsLockAvailable(profile_))
@@ skipping 42 matching lines @@
   return;
 #else
   // Don't bother if we don't have any kind of network connection.
   if (net::NetworkChangeNotifier::IsOffline()) {
     delayed_callbacks_.push_back(callback);
   } else {
     callback.Run();
   }
 #endif
 }