Refactor ProfileInfoCache in c/b/profiles

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 <stddef.h>
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_info_cache.h"
+#include "chrome/browser/profiles/profile_attributes_entry.h"
+#include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 88 matching lines @@
                                  last_updated_.ToInternalValue());
   ScheduleNextUpdate();
 
   base::string16 full_name = downloader->GetProfileFullName();
   base::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)
+  ProfileAttributesEntry* entry;

[lwchkg, 2016/03/14 15:49:10]

Not sure if any of these returns should be DCHECKs. WDYT?

BTW, it could be legitimate in some of these case for
GetProfileAttributesWithPath to fail, because the profile is deleted by the user
during async operations. In this case we should not change the returns into
DCHECKs.

[Mike Lerman, 2016/03/18 17:10:44]

Leaving the returns as is makes sense to me.

[lwchkg, 2016/03/19 18:48:45]

Acknowledged.

+  if (!g_browser_process->profile_manager()->GetProfileAttributesStorage().
+          GetProfileAttributesWithPath(profile_->GetPath(), &entry)) {
     return;
+  }
 
-  cache.SetGAIANameOfProfileAtIndex(profile_index, full_name);
-  // The profile index may have changed.
-  profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
-  DCHECK_NE(profile_index, std::string::npos);
-
-  cache.SetGAIAGivenNameOfProfileAtIndex(profile_index, given_name);
-  // The profile index may have changed.
-  profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
-  DCHECK_NE(profile_index, std::string::npos);
+  entry->SetGAIAName(full_name);
+  entry->SetGAIAGivenName(given_name);
 
   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);
+    entry->SetGAIAPicture(&gfx_image);
   } else if (picture_status == ProfileDownloader::PICTURE_DEFAULT) {
-    cache.SetGAIAPictureOfProfileAtIndex(profile_index, NULL);
+    entry->SetGAIAPicture(nullptr);
   }
 
   const base::string16 hosted_domain = downloader->GetProfileHostedDomain();
   profile_->GetPrefs()->SetString(prefs::kGoogleServicesHostedDomain,
       (hosted_domain.empty() ? Profile::kNoHostedDomainFound :
                                base::UTF16ToUTF8(hosted_domain)));
 }
 
 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(const std::string& username) {
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  size_t profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
-  if (profile_index == std::string::npos)
+  ProfileAttributesEntry* entry;
+  if (!g_browser_process->profile_manager()->GetProfileAttributesStorage().
+          GetProfileAttributesWithPath(profile_->GetPath(), &entry)) {
     return;
+  }
 
   if (username.empty()) {
     // Unset the old user's GAIA info.
-    cache.SetGAIANameOfProfileAtIndex(profile_index, base::string16());
-    cache.SetGAIAGivenNameOfProfileAtIndex(profile_index, base::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->SetGAIAName(base::string16());
+    entry->SetGAIAGivenName(base::string16());
+    entry->SetGAIAPicture(nullptr);
     // Unset the cached URL.
     profile_->GetPrefs()->ClearPref(prefs::kProfileGAIAInfoPictureURL);
   } else {
     // Update the new user's GAIA info.
     Update();
   }
 }
 
 void GAIAInfoUpdateService::Shutdown() {
   timer_.Stop();
   profile_image_downloader_.reset();
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(profile_);
   signin_manager->RemoveObserver(this);
 
   // OK to reset |profile_| pointer here because GAIAInfoUpdateService will not
   // access it again.  This pointer is also used to implement the delegate for
   // |profile_image_downloader_|.  However that object was destroyed above.
-  profile_ = NULL;
+  profile_ = nullptr;
 }
 
 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_;
 
@@ skipping 10 matching lines @@
     const std::string& account_id,
     const std::string& username,
     const std::string& password) {
   OnUsernameChanged(username);
 }
 
 void GAIAInfoUpdateService::GoogleSignedOut(const std::string& account_id,
                                             const std::string& username) {
   OnUsernameChanged(std::string());
 }