Sooper experimental refactoring of the profile info cache.

chrome/browser/ui/webui/ntp/ntp_login_handler.cc

 // Copyright (c) 2012 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/ntp/ntp_login_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 188 matching lines @@
 void NTPLoginHandler::UpdateLogin() {
   Profile* profile = Profile::FromWebUI(web_ui());
   std::string username = profile->GetPrefs()->GetString(
       prefs::kGoogleServicesUsername);
 
   string16 header, sub_header;
   std::string icon_url;
   if (!username.empty()) {
     ProfileInfoCache& cache =
         g_browser_process->profile_manager()->GetProfileInfoCache();
-    size_t profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
-    if (profile_index != std::string::npos) {
+
+    ProfileInfoEntry entry;
+    if (cache.GetInfoForProfile(profile->GetPath(), &entry)) {
       // Only show the profile picture and full name for the single profile
       // case. In the multi-profile case the profile picture is visible in the
       // title bar and the full name can be ambiguous.
       if (cache.GetNumberOfProfiles() == 1) {
-        string16 name = cache.GetGAIANameOfProfileAtIndex(profile_index);
+        string16 name = entry.GAIA_full_name();
         if (!name.empty())
           header = CreateSpanWithClass(name, "profile-name");
         const gfx::Image* image =
-            cache.GetGAIAPictureOfProfileAtIndex(profile_index);
+            cache.GetGAIAPictureOfProfile(entry.path());
         if (image)
           icon_url = webui::GetBitmapDataUrl(GetGAIAPictureForNTP(*image));
       }
       if (header.empty())
         header = CreateSpanWithClass(UTF8ToUTF16(username), "profile-name");
     }
   } else {
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
     // Android uses a custom sign in promo. Don't call the function
     // signin::ShouldShowPromo() since it does a bunch of checks that are not
@@ skipping 50 matching lines @@
   values->SetString("login_status_message", message);
   values->SetString("login_status_url",
       hide_sync ? std::string() : chrome::kSyncLearnMoreURL);
   values->SetString("login_status_advanced",
       hide_sync ? string16() :
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_ADVANCED));
   values->SetString("login_status_dismiss",
       hide_sync ? string16() :
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_OK));
 }