Refactor utility methods out of the ProfileManager

chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 60 matching lines @@
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/password_manager/password_store_change.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/profiles/profile_window.h"
+#include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
@@ skipping 959 matching lines @@
 }
 
 // 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();
-  return_value->SetBoolean("enabled",
-      profile_manager->IsMultipleProfilesEnabled());
+  return_value->SetBoolean("enabled", profiles::IsMultipleProfilesEnabled());
 
   ListValue* profiles = new ListValue;
   for (size_t index = 0; index < profile_info_cache.GetNumberOfProfiles();
        ++index) {
     DictionaryValue* item = new DictionaryValue;
     item->SetString("name", profile_info_cache.GetNameOfProfileAtIndex(index));
     item->SetString("path",
                     profile_info_cache.GetPathOfProfileAtIndex(index).value());
     profiles->Append(item);
   }
@@ skipping 73 matching lines @@
     return;
   }
   int num_loads;
   if (!args->GetInteger("num_loads", &num_loads)) {
     AutomationJSONReply(this, reply_message).SendError(
         "Invalid or missing arg: 'num_loads'");
     return;
   }
   new BrowserOpenedWithExistingProfileNotificationObserver(
       this, reply_message, num_loads);
-  ProfileManager::FindOrCreateNewWindowForProfile(
+  profiles::FindOrCreateNewWindowForProfile(
       profile,
       chrome::startup::IS_NOT_PROCESS_STARTUP,
       chrome::startup::IS_NOT_FIRST_RUN,
       chrome::HOST_DESKTOP_TYPE_NATIVE,
       false);
   }
 
 void TestingAutomationProvider::GetWindowForBrowser(int browser_handle,
                                                     bool* success,
                                                     int* handle) {
@@ skipping 4435 matching lines @@
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }
 
 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
                                                   WebContents* tab) {
   TabStripModel* tab_strip = browser->tab_strip_model();
   if (tab_strip->GetActiveWebContents() != tab)
     tab_strip->ActivateTabAt(tab_strip->GetIndexOfWebContents(tab), true);
 }