ChromeOS: This CL moves chromeos/login/user_names* to user_mananger.

chrome/browser/chromeos/app_mode/kiosk_profile_loader.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 "chrome/browser/chromeos/app_mode/kiosk_profile_loader.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/sys_info.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/login/auth/chrome_login_performer.h"
 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/login/auth/auth_status_consumer.h"
 #include "chromeos/login/auth/user_context.h"
-#include "chromeos/login/user_names.h"
 #include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/user_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 
 namespace {
 
 KioskAppLaunchError::Error LoginFailureToKioskAppLaunchError(
@@ skipping 130 matching lines @@
   // LoginPerformer will delete itself.
   login_performer_->set_delegate(NULL);
   ignore_result(login_performer_.release());
 
   // If we are launching a demo session, we need to start MountGuest with the
   // guest username; this is because there are several places in the cros code
   // which rely on the username sent to cryptohome to be $guest. Back in Chrome
   // we switch this back to the demo user name to correctly identify this
   // user as a demo user.
   UserContext context = user_context;
-  if (context.GetAccountId() == login::GuestAccountId())
-    context.SetAccountId(login::DemoAccountId());
+  if (context.GetAccountId() == user_manager::chromeos::GuestAccountId())
+    context.SetAccountId(user_manager::chromeos::DemoAccountId());
   UserSessionManager::GetInstance()->StartSession(
       context, UserSessionManager::PRIMARY_USER_SESSION,
       false,  // has_auth_cookies
       false,  // Start session for user.
       this);
 }
 
 void KioskProfileLoader::OnAuthFailure(const AuthFailure& error) {
   ReportLaunchResult(LoginFailureToKioskAppLaunchError(error));
 }
@@ skipping 14 matching lines @@
                                            bool browser_launched) {
   // This object could be deleted any time after successfully reporting
   // a profile load, so invalidate the delegate now.
   UserSessionManager::GetInstance()->DelegateDeleted(this);
 
   delegate_->OnProfileLoaded(profile);
   ReportLaunchResult(KioskAppLaunchError::NONE);
 }
 
 }  // namespace chromeos