Refactor ProfileInfoCache in c/b/profiles

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 <stddef.h>
+
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.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_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/profile_chooser_constants.h"
@@ skipping 104 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());
-  if (!profile->IsGuestSession() &&
-      cache.ProfileIsSigninRequiredAtIndex(index)) {
-    UnblockExtensions(profile);
+  if (!profile->IsGuestSession()) {
+    ProfileAttributesEntry* entry;
+    if (g_browser_process->profile_manager()->GetProfileAttributesStorage().
+            GetProfileAttributesWithPath(profile->GetPath(), &entry) &&
+        entry->IsSigninRequired()) {
+      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) {
     Browser* browser = chrome::FindTabbedBrowser(profile, false);
@@ skipping 37 matching lines @@
   if (status != Profile::CREATE_STATUS_INITIALIZED || callback.is_null())
     return;
 
   // Tell the webui which user should be focused.
   std::string page = switches::IsMaterialDesignUserManager() ?
       chrome::kChromeUIMdUserManagerUrl : 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) {
-      page += "#";
-      page += base::SizeTToString(index);
+    // TODO(anthonyvd) : Send |profile_path_to_focus| to the user manager
+    // instead of the profile index.
+    std::vector<ProfileAttributesEntry*> entries =
+        g_browser_process->profile_manager()->GetProfileAttributesStorage().
+            GetAllProfilesAttributesSortedByName();

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

This is now very fragile, as we're assuming that we're applying the same sort
that's in user_manager_screen_handler's SendUserList function.

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

Agree.

Anyway I've modified that SendUserList to use the same sort function already in
https://crrev.com/dc9dd38953b1cc32bb6d83b6562d8640f3365180, and sadly no one
noticed the code here in that CL.

And therefore M50 has sadly regressed. I'll file an issue tomorrow.

[Mike Lerman, 2016/03/30 01:18:10]

Let's wait for your other related CL to land first, then rebase this CL onto
that, and then review how this CL looks.

[lwchkg, 2016/03/31 19:32:26]

Sure. Will rebase later today.

+    size_t count = entries.size();
+    for (size_t i = 0; i < count; ++i) {
+      if (profile_path_to_focus == entries[i]->GetPath()) {
+        page += "#";
+        page += base::SizeTToString(i);
+        break;
+      }
     }
   } 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 25 matching lines @@
 const char kUserManagerSelectProfileTaskManager[] = "#task-manager";
 const char kUserManagerSelectProfileAboutChrome[] = "#about-chrome";
 const char kUserManagerSelectProfileChromeSettings[] = "#chrome-settings";
 const char kUserManagerSelectProfileChromeMemory[] = "#chrome-memory";
 const char kUserManagerSelectProfileAppLauncher[] = "#app-launcher";
 
 base::FilePath GetPathOfProfileWithEmail(ProfileManager* profile_manager,
                                          const std::string& email) {
   base::string16 profile_email = base::UTF8ToUTF16(email);
   std::vector<ProfileAttributesEntry*> entries =
-      profile_manager->GetProfileInfoCache().GetAllProfilesAttributes();
+      profile_manager->GetProfileAttributesStorage().GetAllProfilesAttributes();
   for (ProfileAttributesEntry* entry : entries) {
     if (entry->GetUserName() == profile_email)
       return entry->GetPath();
   }
   return base::FilePath();
 }
 
 void FindOrCreateNewWindowForProfile(
     Profile* profile,
     chrome::startup::IsProcessStartup process_startup,
@@ skipping 43 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(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),
       profiles::GetDefaultAvatarIconUrl(placeholder_avatar_index),
       base::Bind(&OpenBrowserWindowForProfile, callback, true, true),
       std::string());
   ProfileMetrics::LogProfileAddNewUser(metric);
 }
 
 void GuestBrowserCloseSuccess(const base::FilePath& profile_path) {
   UserManager::Show(base::FilePath(),
                     profiles::USER_MANAGER_NO_TUTORIAL,
                     profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
 }
 
 void CloseGuestProfileWindows() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   Profile* profile = profile_manager->GetProfileByPath(
       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);
+  ProfileAttributesEntry* entry;
+  bool has_entry = profile_manager->GetProfileAttributesStorage().
+                       GetProfileAttributesWithPath(profile_path, &entry);
+  DCHECK(has_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))
+  // Lock only when there is at least one supervised user on the machine.
+  std::vector<ProfileAttributesEntry*> entries =
+      g_browser_process->profile_manager()->GetProfileAttributesStorage().
+          GetAllProfilesAttributes();
+  for (ProfileAttributesEntry* entry : entries) {
+    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 118 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