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

chrome/browser/chromeos/login/ui/webui_login_display.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/chromeos/login/ui/webui_login_display.h"
 
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"
 #include "chrome/browser/chromeos/login/signin_screen_controller.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
-#include "chromeos/login/user_names.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/user_manager/user_manager.h"
+#include "components/user_manager/user_names.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/views/widget/widget.h"
 
 namespace chromeos {
 
 // WebUILoginDisplay, public: --------------------------------------------------
 
@@ skipping 186 matching lines @@
   DCHECK(delegate_);
   if (delegate_)
     delegate_->MigrateUserData(old_password);
 }
 
 void WebUILoginDisplay::LoadWallpaper(const AccountId& account_id) {
   WallpaperManager::Get()->SetUserWallpaperDelayed(account_id);
 }
 
 void WebUILoginDisplay::LoadSigninWallpaper() {
-  WallpaperManager::Get()->SetDefaultWallpaperDelayed(login::SignInAccountId());
+  WallpaperManager::Get()->SetDefaultWallpaperDelayed(
+      user_manager::chromeos::SignInAccountId());
 }
 
 void WebUILoginDisplay::OnSigninScreenReady() {
   SignInScreenController::Get()->OnSigninScreenReady();
 
   if (delegate_)
     delegate_->OnSigninScreenReady();
 }
 
 void WebUILoginDisplay::RemoveUser(const AccountId& account_id) {
@@ skipping 87 matching lines @@
 }
 
 bool WebUILoginDisplay::IsUserWhitelisted(const AccountId& account_id) {
   DCHECK(delegate_);
   if (delegate_)
     return delegate_->IsUserWhitelisted(account_id);
   return true;
 }
 
 }  // namespace chromeos