Refactor ProfileInfoCache in c/b/ui/app_list

chrome/browser/ui/app_list/app_list_view_delegate.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/ui/app_list/app_list_view_delegate.h"
 
 #include <stddef.h>
 
+#include <algorithm>
+#include <functional>
 #include <vector>
 
 #include "apps/custom_launcher_page_contents.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/metrics/user_metrics.h"
 #include "base/prefs/pref_service.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/stl_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/apps/scoped_keep_alive.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.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/search/hotword_service.h"
 #include "chrome/browser/search/hotword_service_factory.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
 #include "chrome/browser/ui/app_list/launcher_page_event_dispatcher.h"
 #include "chrome/browser/ui/app_list/search/search_controller_factory.h"
@@ skipping 66 matching lines @@
     base::Callback<void(const base::FilePath&)> callback,
     scoped_ptr<web_app::ShortcutInfo> info) {
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::FILE, FROM_HERE,
       base::Bind(web_app::CreateShortcutInWebAppDir, app_data_dir,
                  base::Passed(&info)),
       callback);
 }
 #endif
 
-void PopulateUsers(const ProfileInfoCache& profile_info,
-                   const base::FilePath& active_profile_path,
+void PopulateUsers(const base::FilePath& active_profile_path,
                    app_list::AppListViewDelegate::Users* users) {
   users->clear();
-  const size_t count = profile_info.GetNumberOfProfiles();
-  for (size_t i = 0; i < count; ++i) {
+  std::vector<ProfileAttributesEntry*> entries = g_browser_process->
+      profile_manager()->GetProfileAttributesStorage().
+      GetAllProfilesAttributes();
+  ProfileAttributesEntry::SortComparator comp;
+  std::sort(entries.begin(), entries.end(), std::cref(comp));

[lwchkg, 2016/02/03 17:18:38]

Tried a few methods for one day... most failing except for the one uploaded
here:

(1) making a default move constructor... VC++ rejected by refusing to compile. I
don't know why it fails.
    Anyway... why a move constructor? the scoped_ptr needs to be moved back in
the inner function calls!
(2) enforcing std::sort<..., ..., ...&>. The outer call is enforced, but
std::sort loses the & when passing ...& to inner calls. I've checked that VC++
and GCC does the same thing.
(3) std::bind : it copy constructs the class.

The correct solution is very simple... wrap the comparator (needs to be a
lvalue) in a reference_wrapper, i.e. std::cref(comparator).

I'm not sure whether the use of reference wrappers is allowed in Chromium
though. The Google C++ style and Chromium style says differently. Anyway, if not
we need a hacky implementation in patch #3, which is inefficient and also
smells.

Maybe we can use the two patches for discussion in chromium-dev.

+  for (const auto entry : entries) {
     app_list::AppListViewDelegate::User user;
-    user.name = profile_info.GetNameOfProfileAtIndex(i);
-    user.email = profile_info.GetUserNameOfProfileAtIndex(i);
-    user.profile_path = profile_info.GetPathOfProfileAtIndex(i);
+    user.name = entry->GetName();
+    user.email = entry->GetUserName();
+    user.profile_path = entry->GetPath();
     user.active = active_profile_path == user.profile_path;
     users->push_back(user);
   }
 }
 
 // Gets a list of URLs of the custom launcher pages to show in the launcher.
 // Returns a URL for each installed launcher page. If --custom-launcher-page is
 // specified and valid, also includes that URL.
 void GetCustomLauncherPageUrls(content::BrowserContext* browser_context,
                                std::vector<GURL>* urls) {
@@ skipping 62 matching lines @@
        i != profiles.end();
        ++i) {
     SigninManagerBase* manager =
         SigninManagerFactory::GetForProfileIfExists(*i);
     if (manager) {
       DCHECK(!scoped_observer_.IsObserving(manager));
       scoped_observer_.Add(manager);
     }
   }
 
-  profile_manager->GetProfileInfoCache().AddObserver(this);
+  profile_manager->GetProfileAttributesStorage().AddObserver(this);
   speech_ui_.reset(new app_list::SpeechUIModel);
 
 #if defined(GOOGLE_CHROME_BUILD)
   gfx::ImageSkia* image;
   {
     // TODO(tapted): Remove ScopedTracker below once crbug.com/431326 is fixed.
     tracked_objects::ScopedTracker tracking_profile(
         FROM_HERE_WITH_EXPLICIT_FUNCTION("431326 GetImageSkiaNamed()"));
     image = ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_APP_LIST_GOOGLE_LOGO_VOICE_SEARCH);
   }
 
   speech_ui_->set_logo(*image);
 #endif
 
   registrar_.Add(this,
                  chrome::NOTIFICATION_APP_TERMINATING,
                  content::NotificationService::AllSources());
 }
 
 AppListViewDelegate::~AppListViewDelegate() {
   // Note that the destructor is not always called. E.g. on Mac, this is owned
   // by a leaky singleton. Essential shutdown work must be done by observing
   // chrome::NOTIFICATION_APP_TERMINATING.
   SetProfile(NULL);
-  g_browser_process->profile_manager()->GetProfileInfoCache().RemoveObserver(
-      this);
+  g_browser_process->profile_manager()->GetProfileAttributesStorage().
+      RemoveObserver(this);
 
   SigninManagerFactory* factory = SigninManagerFactory::GetInstance();
   if (factory)
     factory->RemoveObserver(this);
 }
 
 void AppListViewDelegate::SetProfile(Profile* new_profile) {
   if (profile_ == new_profile)
     return;
 
@@ skipping 83 matching lines @@
   if (!profile_)
     return;
 
   // Don't populate the app list users if we are on the ash desktop.
   chrome::HostDesktopType desktop = chrome::GetHostDesktopTypeForNativeWindow(
       controller_->GetAppListWindow());
   if (desktop == chrome::HOST_DESKTOP_TYPE_ASH)
     return;
 
   // Populate the app list users.
-  PopulateUsers(g_browser_process->profile_manager()->GetProfileInfoCache(),
-                profile_->GetPath(),
-                &users_);
+  PopulateUsers(profile_->GetPath(), &users_);
 
   FOR_EACH_OBSERVER(
       app_list::AppListViewDelegateObserver, observers_, OnProfilesChanged());
 }
 
 void AppListViewDelegate::SetUpCustomLauncherPages() {
   std::vector<GURL> custom_launcher_page_urls;
   GetCustomLauncherPageUrls(profile_, &custom_launcher_page_urls);
   if (custom_launcher_page_urls.empty())
     return;
@@ skipping 480 matching lines @@
 
       // SigninManagerFactory is not a leaky singleton (unlike this class), and
       // its destructor will check that it has no remaining observers.
       scoped_observer_.RemoveAll();
       SigninManagerFactory::GetInstance()->RemoveObserver(this);
       break;
     default:
       NOTREACHED();
   }
 }