[cros] user_manager component - move UserManagerBase and UserManager

chrome/browser/chromeos/first_run/first_run.cc

 // Copyright 2013 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 "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/first_run/first_run_controller.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/pref_registry/pref_registry_syncable.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 
 namespace chromeos {
 namespace first_run {
 
 namespace {
@@ skipping 32 matching lines @@
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     DCHECK(type == chrome::NOTIFICATION_SESSION_STARTED);
     DCHECK(content::Details<const user_manager::User>(details).ptr() ==
            ProfileHelper::Get()->GetUserByProfile(profile_));
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     bool launched_in_test = command_line->HasSwitch(::switches::kTestType);
     bool launched_in_telemetry =
         command_line->HasSwitch(switches::kOobeSkipPostLogin);
-    bool is_user_new = chromeos::UserManager::Get()->IsCurrentUserNew();
+    bool is_user_new = user_manager::UserManager::Get()->IsCurrentUserNew();
     bool first_run_forced = command_line->HasSwitch(switches::kForceFirstRunUI);
     bool first_run_seen =
         profile_->GetPrefs()->GetBoolean(prefs::kFirstRunTutorialShown);
     if (!launched_in_telemetry &&
         ((is_user_new && !first_run_seen && !launched_in_test) ||
          first_run_forced)) {
       LaunchDialogForProfile(profile_);
     }
     delete this;
   }
 
  private:
   Profile* profile_;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(DialogLauncher);
 };
 
 }  // namespace
 
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kFirstRunTutorialShown,
       false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
 }
 
 void MaybeLaunchDialogAfterSessionStart() {
-  UserManager* user_manager = UserManager::Get();
-  new DialogLauncher(
-      ProfileHelper::Get()->GetProfileByUser(user_manager->GetActiveUser()));
+  new DialogLauncher(ProfileHelper::Get()->GetProfileByUser(

[Dmitry Polukhin, 2014/08/12 09:03:12]

I think it is better to replace with  ProfileManager::GetActiveUserProfile()

[Nikita (slow), 2014/08/12 09:34:42]

Done.

+      user_manager::UserManager::Get()->GetActiveUser()));
 }
 
 void LaunchTutorial() {
   UMA_HISTOGRAM_BOOLEAN("CrosFirstRun.TutorialLaunched", true);
   FirstRunController::Start();
 }
 
 }  // namespace first_run
 }  // namespace chromeos