Refactor ProfileInfoCache

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2011 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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 1420 matching lines @@
   new BrowserOpenedWithNewProfileNotificationObserver(this, reply_message);
   profile_manager->CreateMultiProfileAsync();
 }
 
 // Sample json input: { "command": "GetMultiProfileInfo" }
 // See GetMultiProfileInfo() in pyauto.py for sample output.
 void TestingAutomationProvider::GetMultiProfileInfo(
     base::DictionaryValue* args, IPC::Message* reply_message) {
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   ProfileManager* profile_manager = g_browser_process->profile_manager();
-  const ProfileInfoCache& profile_info_cache =
-      profile_manager->GetProfileInfoCache();
+  const ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   return_value->SetBoolean("enabled",
       profile_manager->IsMultipleProfilesEnabled());
 
   ListValue* profiles = new ListValue;
-  for (size_t index = 0; index < profile_info_cache.GetNumberOfProfiles();
-       ++index) {
+  const std::vector<ProfileInfoEntry> entries(cache.GetProfilesSortedByName());
+  for (std::vector<ProfileInfoEntry>::const_iterator it = entries.begin();
+      it != entries.end(); ++it) {
     DictionaryValue* item = new DictionaryValue;
-    item->SetString("name", profile_info_cache.GetNameOfProfileAtIndex(index));
-    item->SetString("path",
-                    profile_info_cache.GetPathOfProfileAtIndex(index).value());
+    item->SetString("name", it->name());
+    item->SetString("path", it->path().value());
     profiles->Append(item);
   }
   return_value->Set("profiles", profiles);
   AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
 }
 
 void TestingAutomationProvider::OpenNewBrowserWindowOfType(
     int type, bool show, IPC::Message* reply_message) {
   new BrowserOpenedNotificationObserver(this, reply_message);
   // We may have no current browser windows open so don't rely on
@@ skipping 4925 matching lines @@
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }