Refactor utility methods out of the ProfileManager

chrome/browser/profiles/avatar_menu_model.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/profiles/avatar_menu_model.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu_model_observer.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_manager_util.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
@@ skipping 15 matching lines @@
 
 namespace {
 
 void OnProfileCreated(bool always_create,
                       chrome::HostDesktopType desktop_type,
                       Profile* profile,
                       Profile::CreateStatus status) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (status == Profile::CREATE_STATUS_INITIALIZED) {
-    ProfileManager::FindOrCreateNewWindowForProfile(
+    profiles::FindOrCreateNewWindowForProfile(
         profile,
         chrome::startup::IS_NOT_PROCESS_STARTUP,
         chrome::startup::IS_NOT_FIRST_RUN,
         desktop_type,
         always_create);
   }
 }
 
 // Constants for the show profile switcher experiment
 const char kShowProfileSwitcherFieldTrialName[] = "ShowProfileSwitcher";
@@ skipping 68 matching lines @@
       active(false),
       signed_in(false),
       signin_required(false),
       model_index(model_index) {
 }
 
 AvatarMenuModel::Item::~Item() {
 }
 
 void AvatarMenuModel::SwitchToProfile(size_t index, bool always_create) {
-  DCHECK(ProfileManager::IsMultipleProfilesEnabled() ||
+  DCHECK(profiles::IsMultipleProfilesEnabled() ||
          index == GetActiveProfileIndex());
   const Item& item = GetItemAt(index);
   base::FilePath path =
       profile_info_->GetPathOfProfileAtIndex(item.model_index);
 
   chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop();
   if (browser_)
     desktop_type = browser_->host_desktop_type();
 
   g_browser_process->profile_manager()->CreateProfileAsync(
@@ skipping 108 matching lines @@
 // static
 bool AvatarMenuModel::ShouldShowAvatarMenu() {
 #if defined(OS_CHROMEOS)
   // On Chrome OS we use different UI for multi-profiles.
   return false;
 #endif
 
   if (base::FieldTrialList::FindFullName(kShowProfileSwitcherFieldTrialName) ==
       kAlwaysShowSwitcherGroupName) {
     // We should only be in this group when multi-profiles is enabled.
-    DCHECK(ProfileManager::IsMultipleProfilesEnabled());
+    DCHECK(profiles::IsMultipleProfilesEnabled());
     return true;
   }
-  return ProfileManager::IsMultipleProfilesEnabled() &&
+  return profiles::IsMultipleProfilesEnabled() &&
       g_browser_process->profile_manager() &&
       g_browser_process->profile_manager()->GetNumberOfProfiles() > 1;
 }
 
 void AvatarMenuModel::RebuildMenu() {
   ClearMenu();
 
   const size_t count = profile_info_->GetNumberOfProfiles();
   for (size_t i = 0; i < count; ++i) {
     bool is_gaia_picture =
@@ skipping 54 matching lines @@
   contents->GetController().LoadURL(
     logout_url, content::Referrer(),
     content::PAGE_TRANSITION_GENERATED, std::string());
 
   // This object may be destructed when the menu closes but we need something
   // around to finish the sign-out process and close the profile windows.
   new SignoutTracker(current_profile, GURL(landing_url), contents);
 
   return contents;  // returned for testing purposes
 }