Refactor utility methods out of the ProfileManager

chrome/browser/ui/views/avatar_menu_button.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/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/avatar_menu_model.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/profiles_state.h"
 #include "chrome/browser/ui/browser.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/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/widget/widget.h"
 
 static inline int Round(double x) {
@@ skipping 64 matching lines @@
   if (incognito_)
     return;
 
   ShowAvatarBubble();
 }
 
 void AvatarMenuButton::ShowAvatarBubble() {
   gfx::Point origin;
   views::View::ConvertPointToScreen(this, &origin);
   gfx::Rect bounds(origin, size());
-  if (ProfileManager::IsNewProfileManagementEnabled()) {
+  if (profiles::IsNewProfileManagementEnabled()) {
     ProfileChooserView::ShowBubble(
         this, views::BubbleBorder::TOP_LEFT,
         views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR, bounds, browser_);
   } else {
     AvatarMenuBubbleView::ShowBubble(
         this, views::BubbleBorder::TOP_LEFT,
         views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR, bounds, browser_);
   }
 
   ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE);
 }