Refactor most c/b/profiles calls to ProfileInfoCache.

chrome/browser/profiles/profile_window.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/profiles/profile_window.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/pref_service_flags_storage.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_attributes_entry.h"
+#include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/account_reconcilor_factory.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_ui_util.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ skipping 97 matching lines @@
   // If this is a brand new profile, then start a first run window.
   if (is_new_profile) {
     is_process_startup = chrome::startup::IS_PROCESS_STARTUP;
     is_first_run = chrome::startup::IS_FIRST_RUN;
   }
 
 #if defined(ENABLE_EXTENSIONS)
   // The signin bit will still be set if the profile is being unlocked and the
   // browser window for it is opening. As part of this unlock process, unblock
   // all the extensions.
-  const ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  int index = cache.GetIndexOfProfileWithPath(profile->GetPath());
+  ProfileAttributesStorage& storage =
+      g_browser_process->profile_manager()->GetProfileAttributesStorage();
+  ProfileAttributesEntry* entry = nullptr;
   if (!profile->IsGuestSession() &&
-      cache.ProfileIsSigninRequiredAtIndex(index)) {
+      !storage.GetProfileAttributesWithPath(profile->GetPath(), &entry)) {
+    NOTREACHED();
+    return;
+  }
+
+  if (!profile->IsGuestSession() && entry->IsSigninRequired()) {

[Mike Lerman, 2015/08/06 16:06:20]

you don't need to verify IsGuestSession() twice (here and line 139)

     UnblockExtensions(profile);
   }
 #endif  // defined(ENABLE_EXTENSIONS)
 
   // If |always_create| is false, and we have a |callback| to run, check
   // whether a browser already exists so that we can run the callback. We don't
   // want to rely on the observer listening to OnBrowserSetLastActive in this
   // case, as you could manually activate an incorrect browser and trigger
   // a false positive.
   if (!always_create) {
@@ skipping 41 matching lines @@
     Profile::CreateStatus status) {
   if (status != Profile::CREATE_STATUS_INITIALIZED || callback.is_null())
     return;
 
   // Tell the webui which user should be focused.
   std::string page = chrome::kChromeUIUserManagerURL;
 
   if (tutorial_mode == profiles::USER_MANAGER_TUTORIAL_OVERVIEW) {
     page += profiles::kUserManagerDisplayTutorial;
   } else if (!profile_path_to_focus.empty()) {
-    const ProfileInfoCache& cache =
-        g_browser_process->profile_manager()->GetProfileInfoCache();
-    size_t index = cache.GetIndexOfProfileWithPath(profile_path_to_focus);
-    if (index != std::string::npos) {
+
+    ProfileAttributesStorage& storage =
+        g_browser_process->profile_manager()->GetProfileAttributesStorage();
+    std::vector<ProfileAttributesEntry*> entries =
+        storage.GetAllProfilesAttributes();
+    ProfileAttributesEntry* entry_to_focus;
+    if (storage.GetProfileAttributesWithPath(profile_path_to_focus,
+        &entry_to_focus)) {
+      // The index of an entry in an hypothetically sorted collection is equal
+      // to the count of items that compare as smaller than said entry, since
+      // it's impossible for entries to compare as equal.
+      auto index_to_focus = std::count_if(entries.begin(), entries.end(),
+          [&entry_to_focus] (ProfileAttributesEntry* other) {
+            return other->LessThan(*entry_to_focus);
+          });
       page += "#";
-      page += base::IntToString(index);
+      page += base::IntToString(index_to_focus);

[Mike Lerman, 2015/08/06 16:06:20]

well... this is annoying. We probably shouldn't use an index (since
UserManagerScreenHandler::SendUserList() doesn't do any sorting). You'll need a
different unique identifier or hash-key (such as the profile directory perhaps,
although URL encoding an arbitrary file-system name is yucky). Or... sort
SendUserList.

     }
   } else if (profile_open_action ==
              profiles::USER_MANAGER_SELECT_PROFILE_TASK_MANAGER) {
     page += profiles::kUserManagerSelectProfileTaskManager;
   } else if (profile_open_action ==
              profiles::USER_MANAGER_SELECT_PROFILE_ABOUT_CHROME) {
     page += profiles::kUserManagerSelectProfileAboutChrome;
   } else if (profile_open_action ==
              profiles::USER_MANAGER_SELECT_PROFILE_CHROME_SETTINGS) {
     page += profiles::kUserManagerSelectProfileChromeSettings;
@@ skipping 96 matching lines @@
 bool HasProfileSwitchTargets(Profile* profile) {
   size_t min_profiles = profile->IsGuestSession() ? 1 : 2;
   size_t number_of_profiles =
       g_browser_process->profile_manager()->GetNumberOfProfiles();
   return number_of_profiles >= min_profiles;
 }
 
 void CreateAndSwitchToNewProfile(chrome::HostDesktopType desktop_type,
                                  ProfileManager::CreateCallback callback,
                                  ProfileMetrics::ProfileAdd metric) {
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
+  ProfileAttributesStorage& storage =
+      g_browser_process->profile_manager()->GetProfileAttributesStorage();
 
   int placeholder_avatar_index = profiles::GetPlaceholderAvatarIndex();
   ProfileManager::CreateMultiProfileAsync(
-      cache.ChooseNameForNewProfile(placeholder_avatar_index),
+      storage.ChooseNameForNewProfile(placeholder_avatar_index),
       base::UTF8ToUTF16(profiles::GetDefaultAvatarIconUrl(
           placeholder_avatar_index)),
       base::Bind(&OpenBrowserWindowForProfile,
                  callback,
                  true,
                  true,
                  desktop_type),
       std::string());
   ProfileMetrics::LogProfileAddNewUser(metric);
 }
@@ skipping 10 matching lines @@
       ProfileManager::GetGuestProfilePath());
 
   if (profile) {
     BrowserList::CloseAllBrowsersWithProfile(
         profile, base::Bind(&GuestBrowserCloseSuccess));
   }
 }
 
 void LockBrowserCloseSuccess(const base::FilePath& profile_path) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
-  ProfileInfoCache* cache = &profile_manager->GetProfileInfoCache();
 
-  cache->SetProfileSigninRequiredAtIndex(
-      cache->GetIndexOfProfileWithPath(profile_path), true);
+  ProfileAttributesStorage& storage =
+      profile_manager->GetProfileAttributesStorage();
+  ProfileAttributesEntry* entry;
+  if (storage.GetProfileAttributesWithPath(profile_path, &entry)) {
+    entry->SetIsSigninRequired(true);
+  }
 
 #if defined(ENABLE_EXTENSIONS)
   // Profile guaranteed to exist for it to have been locked.
   BlockExtensions(profile_manager->GetProfileByPath(profile_path));
 #endif  // defined(ENABLE_EXTENSIONS)
 
   chrome::HideTaskManager();
   UserManager::Show(profile_path,
                     profiles::USER_MANAGER_NO_TUTORIAL,
                     profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
@@ skipping 26 matching lines @@
       SigninManagerFactory::GetForProfile(profile)->GetAuthenticatedAccountId();
     hosted_domain = account_tracker->GetAccountInfo(account_id).hosted_domain;
   }
   // TODO(mlerman): Prohibit only users who authenticate using SAML. Until then,
   // prohibited users who use hosted domains (aside from google.com).
   if (hosted_domain != Profile::kNoHostedDomainFound &&
       hosted_domain != "google.com") {
     return false;
   }
 
-  const ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
-    if (cache.ProfileIsSupervisedAtIndex(i))
+  ProfileAttributesStorage& storage =
+      g_browser_process->profile_manager()->GetProfileAttributesStorage();
+  std::vector<ProfileAttributesEntry*> entries =
+      storage.GetAllProfilesAttributes();
+  for (ProfileAttributesEntry* entry: entries) {

[Mike Lerman, 2015/08/06 16:06:20]

entry<space>:

+    if (entry->IsSupervised())
       return true;
   }
   return false;
 }
 
 void CreateSystemProfileForUserManager(
     const base::FilePath& profile_path_to_focus,
     profiles::UserManagerTutorialMode tutorial_mode,
     profiles::UserManagerProfileSelected profile_open_action,
     const base::Callback<void(Profile*, const std::string&)>& callback) {
@@ skipping 120 matching lines @@
   PrefService* local_state = g_browser_process->local_state();
   const bool dismissed = local_state->GetBoolean(
       prefs::kProfileAvatarRightClickTutorialDismissed);
 
   // Don't show the tutorial if it's already been dismissed or if right-clicking
   // wouldn't show any targets.
   return !dismissed && HasProfileSwitchTargets(profile);
 }
 
 }  // namespace profiles