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

chrome/browser/ui/webui/options/chromeos/accounts_options_handler.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/webui/options/chromeos/accounts_options_handler.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"
 #include "chrome/grit/generated_resources.h"
-#include "chromeos/login/user_names.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/user_manager.h"
+#include "components/user_manager/user_names.h"
 #include "content/public/browser/web_ui.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 
 namespace {
 
 // Adds specified user to the whitelist. Returns false if that user is already
 // in the whitelist.
@@ skipping 112 matching lines @@
   else
     new_list.reset(new base::ListValue);
 
   // Remove all supervised users. On the next step only supervised users present
   // on the device will be added back. Thus not present SU are removed.
   // No need to remove usual users as they can simply login back.
   for (size_t i = 0; i < new_list->GetSize(); ++i) {
     std::string whitelisted_user;
     new_list->GetString(i, &whitelisted_user);
     if (gaia::ExtractDomainName(whitelisted_user) ==
-        chromeos::login::kSupervisedUserDomain) {
+        user_manager::chromeos::kSupervisedUserDomain) {
       new_list->Remove(i, NULL);
       --i;
     }
   }
 
   const user_manager::UserList& users =
       user_manager::UserManager::Get()->GetUsers();
   for (const auto* user : users) {
     new_list->AppendIfNotPresent(
         base::MakeUnique<base::StringValue>(user->email()));
   }
 
   if (OwnerSettingsServiceChromeOS* service =
           OwnerSettingsServiceChromeOS::FromWebUI(web_ui())) {
     service->Set(kAccountsPrefUsers, *new_list.get());
   }
 }
 
 }  // namespace options
 }  // namespace chromeos