Refactor utility methods out of the ProfileManager

chrome/browser/profiles/avatar_menu_model_unittest.cc

Index: chrome/browser/profiles/avatar_menu_model_unittest.cc
diff --git a/chrome/browser/profiles/avatar_menu_model_unittest.cc b/chrome/browser/profiles/avatar_menu_model_unittest.cc
index b01282702c26c2da24ea1e1570a5313805361abd..0a48e4aabcf99014f8b25b8bc63f838c47680957 100644
--- a/chrome/browser/profiles/avatar_menu_model_unittest.cc
+++ b/chrome/browser/profiles/avatar_menu_model_unittest.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/avatar_menu_model_observer.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
-#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "grit/generated_resources.h"
@@ -182,7 +182,7 @@ TEST_F(AvatarMenuModelTest, ChangeOnNotify) {
 TEST_F(AvatarMenuModelTest, ShowAvatarMenuInTrial) {
   // If multiprofile mode is not enabled, the trial will not be enabled, so it
   // isn't tested.
-  if (!ProfileManager::IsMultipleProfilesEnabled())
+  if (!profiles::IsMultipleProfilesEnabled())
     return;
 
   base::FieldTrialList field_trial_list_(NULL);
@@ -204,7 +204,7 @@ TEST_F(AvatarMenuModelTest, DontShowAvatarMenu) {
 
   // If multiprofile mode is enabled, there are no other cases when we wouldn't
   // show the menu.
-  if (ProfileManager::IsMultipleProfilesEnabled())
+  if (profiles::IsMultipleProfilesEnabled())
     return;
 
   string16 name2(ASCIIToUTF16("Test 2"));
@@ -216,7 +216,7 @@ TEST_F(AvatarMenuModelTest, DontShowAvatarMenu) {
 
 TEST_F(AvatarMenuModelTest, ShowAvatarMenu) {
   // If multiprofile mode is not enabled then the menu is never shown.
-  if (!ProfileManager::IsMultipleProfilesEnabled())
+  if (!profiles::IsMultipleProfilesEnabled())
     return;
 
   string16 name1(ASCIIToUTF16("Test 1"));
@@ -236,7 +236,7 @@ TEST_F(AvatarMenuModelTest, ShowAvatarMenu) {
 
 TEST_F(AvatarMenuModelTest, SyncState) {
   // If multiprofile mode is not enabled then the menu is never shown.
-  if (!ProfileManager::IsMultipleProfilesEnabled())
+  if (!profiles::IsMultipleProfilesEnabled())
     return;
 
   manager()->CreateTestingProfile("p1", scoped_ptr<PrefServiceSyncable>(),