[cros] user_manager component - move UserManagerBase and UserManager

chrome/browser/signin/signin_error_notifier_ash.cc

 // Copyright 2014 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/signin/signin_error_notifier_ash.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/system_notifier.h"
 #include "base/logging.h"
@@ skipping 17 matching lines @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/WebKit/public/web/WebTextDirection.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_delegate.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_flow.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
+#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
+#include "components/user_manager/user_manager.h"
 #endif
 
 namespace {
 
 const char kProfileSigninNotificationId[] = "chrome://settings/signin/";
 
 // A notification delegate for the sign-out button.
 class SigninNotificationDelegate : public NotificationDelegate {
  public:
   SigninNotificationDelegate(const std::string& id,
@@ skipping 112 matching lines @@
   // notification_ui_manager() may return NULL when shutting down.
   if (!notification_ui_manager)
     return;
 
   if (!error_controller_->HasError()) {
     g_browser_process->notification_ui_manager()->CancelById(notification_id_);
     return;
   }
 
 #if defined(OS_CHROMEOS)
-  if (chromeos::UserManager::IsInitialized()) {
+  if (user_manager::UserManager::IsInitialized()) {
     chromeos::UserFlow* user_flow =
-        chromeos::UserManager::Get()->GetCurrentUserFlow();
+        chromeos::ChromeUserManager::Get()->GetCurrentUserFlow();
 
     // Check whether Chrome OS user flow allows launching browser.
     // Example: Supervised user creation flow which handles token invalidation
     // itself and notifications should be suppressed. http://crbug.com/359045
     if (!user_flow->ShouldLaunchBrowser())
       return;
   }
 #endif
 
   // Add an accept button to sign the user out.
@@ skipping 51 matching lines @@
       return l10n_util::GetStringUTF16(
           IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE);
       break;
 
     // Generic message for "other" errors.
     default:
       return l10n_util::GetStringUTF16(
           IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE);
   }
 }