Sooper experimental refactoring of the profile info cache.

chrome/browser/profiles/gaia_info_update_service.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/profiles/gaia_info_update_service.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 96 matching lines @@
 
   string16 full_name = downloader->GetProfileFullName();
   string16 given_name = downloader->GetProfileGivenName();
   SkBitmap bitmap = downloader->GetProfilePicture();
   ProfileDownloader::PictureStatus picture_status =
       downloader->GetProfilePictureStatus();
   std::string picture_url = downloader->GetProfilePictureURL();
 
   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))
     return;
 
-  cache.SetGAIANameOfProfileAtIndex(profile_index, full_name);
-  cache.SetGAIAGivenNameOfProfileAtIndex(profile_index, given_name);
+  entry.set_GAIA_full_name(full_name);
+  entry.set_GAIA_given_name(given_name);
 
-  // The profile index may have changed.
-  profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
-  if (profile_index == std::string::npos)
-    return;
   if (picture_status == ProfileDownloader::PICTURE_SUCCESS) {
     profile_->GetPrefs()->SetString(prefs::kProfileGAIAInfoPictureURL,
                                     picture_url);
     gfx::Image gfx_image = gfx::Image::CreateFrom1xBitmap(bitmap);
-    cache.SetGAIAPictureOfProfileAtIndex(profile_index, &gfx_image);
+    cache.SetGAIAPictureOfProfile(entry.path(), &gfx_image);
   } else if (picture_status == ProfileDownloader::PICTURE_DEFAULT) {
-    cache.SetGAIAPictureOfProfileAtIndex(profile_index, NULL);
+    cache.SetGAIAPictureOfProfile(entry.path(), NULL);
   }
 
   // If this profile hasn't switched to using GAIA information for the profile
   // name and picture then switch it now. Once the profile has switched this
   // preference guards against clobbering the user's custom settings.
-  if (!cache.GetHasMigratedToGAIAInfoOfProfileAtIndex(profile_index)) {
-    cache.SetHasMigratedToGAIAInfoOfProfileAtIndex(profile_index, true);
+  if (!entry.has_migrated_to_GAIA_info_of_profile()) {
+    entry.set_has_migrated_to_GAIA_info_of_profile(true);
     // Order matters here for shortcut management, like in
     // ProfileShortcutManagerWin::OnProfileAdded, as the picture update does not
     // allow us to change the target, so we have to apply any renaming first. We
     // also need to re-fetch the index, as SetIsUsingGAIANameOfProfileAtIndex
     // may alter it.
-    cache.SetIsUsingGAIANameOfProfileAtIndex(profile_index, true);
-    profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
-    cache.SetIsUsingGAIAPictureOfProfileAtIndex(profile_index, true);
+    entry.set_is_using_GAIA_name(true);
+    entry.set_is_using_GAIA_picture(true);
   }
+
+  cache.SetInfoForProfile(entry);
 }
 
 void GAIAInfoUpdateService::OnProfileDownloadFailure(
     ProfileDownloader* downloader,
     ProfileDownloaderDelegate::FailureReason reason) {
   profile_image_downloader_.reset();
 
   // Save the last updated time.
   last_updated_ = base::Time::Now();
   profile_->GetPrefs()->SetInt64(prefs::kProfileGAIAInfoUpdateTime,
                                  last_updated_.ToInternalValue());
   ScheduleNextUpdate();
 }
 
 void GAIAInfoUpdateService::OnUsernameChanged() {
   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))
     return;
 
   std::string username = profile_->GetPrefs()->GetString(
       prefs::kGoogleServicesUsername);
   if (username.empty()) {
     // Unset the old user's GAIA info.
-    cache.SetGAIANameOfProfileAtIndex(profile_index, string16());
-    // The profile index may have changed.
-    profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
-    if (profile_index == std::string::npos)
-      return;
-    cache.SetGAIAPictureOfProfileAtIndex(profile_index, NULL);
+    entry.set_GAIA_full_name(string16());
+    cache.SetGAIAPictureOfProfile(entry.path(), NULL);
+    cache.SetInfoForProfile(entry);
     // Unset the cached URL.
     profile_->GetPrefs()->ClearPref(prefs::kProfileGAIAInfoPictureURL);
   } else {
     // Update the new user's GAIA info.
     Update();
   }
 }
 
 void GAIAInfoUpdateService::ScheduleNextUpdate() {
   if (timer_.IsRunning())
     return;
 
   const base::TimeDelta desired_delta =
       base::TimeDelta::FromHours(kUpdateIntervalHours);
   const base::TimeDelta update_delta = base::Time::Now() - last_updated_;
 
   base::TimeDelta delta;
   if (update_delta < base::TimeDelta() || update_delta > desired_delta)
     delta = base::TimeDelta::FromSeconds(kMinUpdateIntervalSeconds);
   else
     delta = desired_delta - update_delta;
 
   timer_.Start(FROM_HERE, delta, this, &GAIAInfoUpdateService::Update);
 }