Refactor utility methods out of the ProfileManager

chrome/browser/ui/views/avatar_menu_button_browsertest.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/ui/views/avatar_menu_button.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/profile_chooser_view.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "content/public/test/test_utils.h"
 #include "grit/generated_resources.h"
@@ skipping 72 matching lines @@
 
   static_cast<views::MenuButtonListener*>(button)->OnMenuButtonClicked(
       NULL, gfx::Point());
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_NE(AvatarMenuBubbleView::IsShowing(),
             ProfileChooserView::IsShowing());
 }
 
 
 IN_PROC_BROWSER_TEST_P(AvatarMenuButtonTest, HideOnSecondClick) {
-  if (!ProfileManager::IsMultipleProfilesEnabled() ||
+  if (!profiles::IsMultipleProfilesEnabled() ||
       UsingNewProfileChooser()) {
     return;
   }
 
   CreateTestingProfile();
   StartAvatarMenu();
 
   // Verify that clicking again doesn't reshow it.
   AvatarMenuButton* button = GetAvatarMenuButton();
   static_cast<views::MenuButtonListener*>(button)->OnMenuButtonClicked(
       NULL, gfx::Point());
   // Hide the bubble manually. In the browser this would normally happen during
   // the event processing.
   AvatarMenuBubbleView::Hide();
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_FALSE(AvatarMenuBubbleView::IsShowing());
   EXPECT_FALSE(ProfileChooserView::IsShowing());
 }
 
 
 IN_PROC_BROWSER_TEST_P(AvatarMenuButtonTest, NewSignOut) {
-  if (!ProfileManager::IsMultipleProfilesEnabled() ||
+  if (!profiles::IsMultipleProfilesEnabled() ||
       !UsingNewProfileChooser()) {
     return;
   }
 
   CreateTestingProfile();
   StartAvatarMenu();
 
   BrowserList* browser_list =
       BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE);
   EXPECT_EQ(1U, browser_list->size());
@@ skipping 16 matching lines @@
 
   EXPECT_TRUE(model->GetItemAt(model->GetActiveProfileIndex()).signin_required);
 
   window_close_observer.Wait();  // Rely on test timeout for failure indication.
   EXPECT_TRUE(browser_list->empty());
 }
 
 
 INSTANTIATE_TEST_CASE_P(Old, AvatarMenuButtonTest, testing::Values(false));
 INSTANTIATE_TEST_CASE_P(New, AvatarMenuButtonTest, testing::Values(true));