Refactor ProfileInfoCache in c/b/ui/app_list

chrome/browser/ui/app_list/app_list_service_impl.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/ui/app_list/app_list_service_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string16.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.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/ui/app_list/app_list_view_delegate.h"
 #include "chrome/browser/ui/app_list/profile_loader.h"
 #include "chrome/browser/ui/app_list/profile_store.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_switches.h"
 
 namespace {
@@ skipping 53 matching lines @@
   }
 }
 
 class ProfileStoreImpl : public ProfileStore {
  public:
   explicit ProfileStoreImpl(ProfileManager* profile_manager)
       : profile_manager_(profile_manager),
         weak_factory_(this) {
   }
 
-  void AddProfileObserver(ProfileInfoCacheObserver* observer) override {
-    profile_manager_->GetProfileInfoCache().AddObserver(observer);
+  void AddProfileObserver(ProfileAttributesStorageObserver* observer) override {
+    profile_manager_->GetProfileAttributesStorage().AddObserver(observer);
   }
 
   void LoadProfileAsync(const base::FilePath& path,
                         base::Callback<void(Profile*)> callback) override {
     profile_manager_->CreateProfileAsync(
         path,
         base::Bind(&ProfileStoreImpl::OnProfileCreated,
                    weak_factory_.GetWeakPtr(),
                    callback),
         base::string16(),
@@ skipping 27 matching lines @@
 
   base::FilePath GetUserDataDir() override {
     return profile_manager_->user_data_dir();
   }
 
   std::string GetLastUsedProfileName() override {
     return profile_manager_->GetLastUsedProfileName();
   }
 
   bool IsProfileSupervised(const base::FilePath& profile_path) override {
-    ProfileInfoCache& profile_info =
-        g_browser_process->profile_manager()->GetProfileInfoCache();
-    size_t profile_index = profile_info.GetIndexOfProfileWithPath(profile_path);
-    return profile_index != std::string::npos &&
-        profile_info.ProfileIsSupervisedAtIndex(profile_index);
+    ProfileAttributesEntry* entry = nullptr;
+    bool has_entry = g_browser_process->profile_manager()->
+        GetProfileAttributesStorage().
+        GetProfileAttributesWithPath(profile_path, &entry);
+    return has_entry && entry->IsSupervised();
   }
 
   bool IsProfileLocked(const base::FilePath& profile_path) override {
-    ProfileInfoCache& profile_info =
-        g_browser_process->profile_manager()->GetProfileInfoCache();
-    size_t profile_index = profile_info.GetIndexOfProfileWithPath(profile_path);
-    return profile_index != std::string::npos &&
-        profile_info.ProfileIsSigninRequiredAtIndex(profile_index);
+    ProfileAttributesEntry* entry = nullptr;
+    bool has_entry = g_browser_process->profile_manager()->
+        GetProfileAttributesStorage().
+        GetProfileAttributesWithPath(profile_path, &entry);
+    return has_entry && entry->IsSigninRequired();
   }
 
  private:
   ProfileManager* profile_manager_;
   base::WeakPtrFactory<ProfileStoreImpl> weak_factory_;
 };
 
 void RecordAppListDiscoverability(PrefService* local_state,
                                   bool is_startup_check) {
   // Since this task may be delayed, ensure it does not interfere with shutdown
@@ skipping 167 matching lines @@
 void AppListServiceImpl::OnProfileWillBeRemoved(
     const base::FilePath& profile_path) {
   // We need to watch for profile removal to keep kAppListProfile updated, for
   // the case that the deleted profile is being used by the app list.
   std::string app_list_last_profile = local_state_->GetString(
       prefs::kAppListProfile);
   if (profile_path.BaseName().MaybeAsASCII() != app_list_last_profile)
     return;
 
   // Switch the app list over to a valid profile.
-  // Before ProfileInfoCache::DeleteProfileFromCache() calls this function,
+  // Before ProfileAttributesStorage::RemoveProfile() calls this function,
   // ProfileManager::ScheduleProfileForDeletion() will have checked to see if
   // the deleted profile was also "last used", and updated that setting with
   // something valid.
   local_state_->SetString(prefs::kAppListProfile,
                           local_state_->GetString(prefs::kProfileLastUsed));
 
   // If the app list was never shown, there won't be a |view_delegate_| yet.
   if (!view_delegate_)
     return;
 
@@ skipping 92 matching lines @@
 
   if (!base::ThreadTaskRunnerHandle::IsSet())
     return;  // In a unit test.
 
   // Send app list usage stats after a delay.
   const int kSendUsageStatsDelay = 5;
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, base::Bind(&AppListServiceImpl::SendAppListStats),
       base::TimeDelta::FromSeconds(kSendUsageStatsDelay));
 }