Refactor utility methods out of the ProfileManager

chrome/browser/ui/webui/options/manage_profile_handler.cc

 // Copyright (c) 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/webui/options/manage_profile_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/value_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/profiles/gaia_info_update_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
+#include "chrome/browser/profiles/profile_window.h"
+#include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 24 matching lines @@
   if (!args->Get(0, &file_path_value))
     return false;
   return base::GetValueAsFilePath(*file_path_value, profile_file_path);
 }
 
 void OnNewDefaultProfileCreated(
     chrome::HostDesktopType desktop_type,
     Profile* profile,
     Profile::CreateStatus status) {
   if (status == Profile::CREATE_STATUS_INITIALIZED) {
-    ProfileManager::FindOrCreateNewWindowForProfile(
+    profiles::FindOrCreateNewWindowForProfile(
       profile,
       chrome::startup::IS_PROCESS_STARTUP,
       chrome::startup::IS_FIRST_RUN,
       desktop_type,
       false);
   }
 }
 
 }  // namespace
 
@@ skipping 241 matching lines @@
     // this preference.
     pref_service->SetInteger(prefs::kProfileAvatarIndex, new_icon_index);
     cache.SetIsUsingGAIAPictureOfProfileAtIndex(profile_index, false);
   }
   ProfileMetrics::LogProfileUpdate(profile_file_path);
 }
 
 #if defined(ENABLE_SETTINGS_APP)
 void ManageProfileHandler::SwitchAppListProfile(const ListValue* args) {
   DCHECK(args);
-  DCHECK(ProfileManager::IsMultipleProfilesEnabled());
+  DCHECK(profiles::IsMultipleProfilesEnabled());
 
   const Value* file_path_value;
   base::FilePath profile_file_path;
   if (!args->Get(0, &file_path_value) ||
       !base::GetValueAsFilePath(*file_path_value, &profile_file_path))
     return;
 
   AppListService::Get()->SetAppListProfile(profile_file_path);
   // Close the settings app, since it will now be for the wrong profile.
   web_ui()->GetWebContents()->Close();
@@ skipping 112 matching lines @@
     g_browser_process->profile_manager()->profile_shortcut_manager();
   DCHECK(shortcut_manager);
 
   shortcut_manager->RemoveProfileShortcuts(profile_file_path);
 
   // Update the UI buttons.
   OnHasProfileShortcuts(false);
 }
 
 }  // namespace options