Refactor utility methods out of the ProfileManager

chrome/browser/profiles/avatar_menu_model_unittest.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/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 class MockObserver : public AvatarMenuModelObserver {
  public:
@@ skipping 150 matching lines @@
   EXPECT_EQ(name2, item2.name);
 
   const AvatarMenuModel::Item& item3 = model.GetItemAt(2);
   EXPECT_EQ(2U, item3.model_index);
   EXPECT_EQ(name3, item3.name);
 }
 
 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);
   base::FieldTrialList::CreateFieldTrial("ShowProfileSwitcher", "AlwaysShow");
 
 #if defined(OS_CHROMEOS)
   EXPECT_FALSE(AvatarMenuModel::ShouldShowAvatarMenu());
 #else
   EXPECT_TRUE(AvatarMenuModel::ShouldShowAvatarMenu());
 #endif
 }
 
 TEST_F(AvatarMenuModelTest, DontShowAvatarMenu) {
   string16 name1(ASCIIToUTF16("Test 1"));
   manager()->CreateTestingProfile("p1", scoped_ptr<PrefServiceSyncable>(),
                                   name1, 0);
 
   EXPECT_FALSE(AvatarMenuModel::ShouldShowAvatarMenu());
 
   // 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"));
   manager()->CreateTestingProfile("p2", scoped_ptr<PrefServiceSyncable>(),
                                   name2, 0);
 
   EXPECT_FALSE(AvatarMenuModel::ShouldShowAvatarMenu());
 }
 
 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"));
   string16 name2(ASCIIToUTF16("Test 2"));
 
   manager()->CreateTestingProfile("p1", scoped_ptr<PrefServiceSyncable>(),
                                   name1, 0);
   manager()->CreateTestingProfile("p2", scoped_ptr<PrefServiceSyncable>(),
                                   name2, 0);
 
 #if defined(OS_CHROMEOS)
   EXPECT_FALSE(AvatarMenuModel::ShouldShowAvatarMenu());
 #else
   EXPECT_TRUE(AvatarMenuModel::ShouldShowAvatarMenu());
 #endif
 }
 
 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>(),
                                   ASCIIToUTF16("Test 1"), 0);
 
   // Add a managed user profile.
   ProfileInfoCache* cache = manager()->profile_info_cache();
   manager()->profile_info_cache()->AddProfileToCache(
       cache->GetUserDataDir().AppendASCII("p2"), ASCIIToUTF16("Test 2"),
       string16(), 0, true);
   MockObserver observer;
   AvatarMenuModel model(manager()->profile_info_cache(), &observer, browser());
   EXPECT_EQ(2U, model.GetNumberOfItems());
 
   // Now check that the sync_state of a managed user shows the managed user
   // avatar label instead.
   base::string16 managed_user_label =
       l10n_util::GetStringUTF16(IDS_MANAGED_USER_AVATAR_LABEL);
   const AvatarMenuModel::Item& item1 = model.GetItemAt(0);
   EXPECT_NE(item1.sync_state, managed_user_label);
 
   const AvatarMenuModel::Item& item2 = model.GetItemAt(1);
   EXPECT_EQ(item2.sync_state, managed_user_label);
 }
 
 }  // namespace