Sooper experimental refactoring of the profile info cache.

chrome/browser/background/background_mode_manager.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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 218 matching lines @@
 
 
 void BackgroundModeManager::RegisterProfile(Profile* profile) {
   // We don't want to register multiple times for one profile.
   DCHECK(background_mode_data_.find(profile) == background_mode_data_.end());
   BackgroundModeInfo bmd(new BackgroundModeData(current_command_id_++,
                                                 profile));
   background_mode_data_[profile] = bmd;
 
   // Initially set the name for this background mode data.
-  size_t index = profile_cache_->GetIndexOfProfileWithPath(profile->GetPath());
   string16 name = l10n_util::GetStringUTF16(IDS_PROFILES_DEFAULT_NAME);
-  if (index != std::string::npos)
-    name = profile_cache_->GetNameOfProfileAtIndex(index);
+  ProfileInfoEntry entry;
+  if (profile_cache_->GetInfoForProfile(profile->GetPath(), &entry))
+    name = entry.GetDisplayName();
   bmd->SetName(name);
 
   // Listen for when extensions are loaded or add the background permission so
   // we can display a "background app installed" notification and enter
   // "launch on login" mode on the Mac.
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  content::Source<Profile>(profile));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_PERMISSIONS_UPDATED,
                  content::Source<Profile>(profile));
 
@@ skipping 106 matching lines @@
     const Extension* extension, Profile* profile) {
   UpdateStatusTrayIconContextMenu();
 }
 
 void BackgroundModeManager::OnApplicationListChanged(Profile* profile) {
   if (!IsBackgroundModePrefEnabled())
     return;
 
   // Update the profile cache with the fact whether background apps are running
   // for this profile.
-  size_t profile_index = profile_cache_->GetIndexOfProfileWithPath(
-      profile->GetPath());
-  if (profile_index != std::string::npos) {
-    profile_cache_->SetBackgroundStatusOfProfileAtIndex(
-        profile_index, GetBackgroundAppCountForProfile(profile) != 0);
+  ProfileInfoEntry entry;
+  if (profile_cache_->GetInfoForProfile(profile->GetPath(), &entry)) {
+    entry.set_is_running_background_apps(
+        GetBackgroundAppCountForProfile(profile) != 0);
+    profile_cache_->SetInfoForProfile(entry);
   }
 
   if (!ShouldBeInBackgroundMode()) {
     // We've uninstalled our last background app, make sure we exit background
     // mode and no longer launch on startup.
     EnableLaunchOnStartup(false);
     EndBackgroundMode();
   } else {
     // We have at least one background app running - make sure we're in
     // background mode.
     if (!in_background_mode_) {
       // We're entering background mode - make sure we have launch-on-startup
       // enabled. On Mac, the platform-specific code tracks whether the user
       // has deleted a login item in the past, and if so, no login item will
       // be created (to avoid overriding the specific user action).
       EnableLaunchOnStartup(true);
 
       StartBackgroundMode();
     }
     // List of applications changed so update the UI.
     UpdateStatusTrayIconContextMenu();
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //  BackgroundModeManager, ProfileInfoCacheObserver overrides
 void BackgroundModeManager::OnProfileAdded(const base::FilePath& profile_path) {
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
-  string16 profile_name = cache.GetNameOfProfileAtIndex(
-      cache.GetIndexOfProfileWithPath(profile_path));
+
+  ProfileInfoEntry entry;
+  if (!cache.GetInfoForProfile(profile_path, &entry))
+    return;
+
+  string16 profile_name = entry.GetDisplayName();
   // At this point, the profile should be registered with the background mode
   // manager, but when it's actually added to the cache is when its name is
   // set so we need up to update that with the background_mode_data.
   for (BackgroundModeInfoMap::const_iterator it =
        background_mode_data_.begin();
        it != background_mode_data_.end();
        ++it) {
     if (it->first->GetPath() == profile_path) {
       it->second->SetName(profile_name);
       UpdateStatusTrayIconContextMenu();
       return;
     }
   }
 }
 
 void BackgroundModeManager::OnProfileWillBeRemoved(
     const base::FilePath& profile_path) {
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
-  string16 profile_name = cache.GetNameOfProfileAtIndex(
-      cache.GetIndexOfProfileWithPath(profile_path));
+
+  ProfileInfoEntry entry;
+  if (!cache.GetInfoForProfile(profile_path, &entry))
+    return;
+
+  string16 profile_name = entry.GetDisplayName();
   // Remove the profile from our map of profiles.
   BackgroundModeInfoMap::iterator it =
       GetBackgroundModeIterator(profile_name);
   // If a profile isn't running a background app, it may not be in the map.
   if (it != background_mode_data_.end()) {
     background_mode_data_.erase(it);
     UpdateStatusTrayIconContextMenu();
   }
 }
 
 void BackgroundModeManager::OnProfileNameChanged(
     const base::FilePath& profile_path,
     const string16& old_profile_name) {
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
-  string16 new_profile_name = cache.GetNameOfProfileAtIndex(
-      cache.GetIndexOfProfileWithPath(profile_path));
+  ProfileInfoEntry entry;
+  if (!cache.GetInfoForProfile(profile_path, &entry))
+    return;
+
+  string16 new_profile_name = entry.GetDisplayName();
   BackgroundModeInfoMap::const_iterator it =
       GetBackgroundModeIterator(old_profile_name);
   // We check that the returned iterator is valid due to unittests, but really
   // this should only be called on profiles already known by the background
   // mode manager.
   if (it != background_mode_data_.end()) {
     it->second->SetName(new_profile_name);
     UpdateStatusTrayIconContextMenu();
   }
 }
@@ skipping 322 matching lines @@
     }
   }
   return profile_it;
 }
 
 bool BackgroundModeManager::IsBackgroundModePrefEnabled() const {
   PrefService* service = g_browser_process->local_state();
   DCHECK(service);
   return service->GetBoolean(prefs::kBackgroundModeEnabled);
 }