[cros] user_manager component - move UserManagerBase and UserManager

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 <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/login/users/user_manager.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/ui/webui/chromeos/ui_account_tweaks.h"
 #include "chromeos/settings/cros_settings_names.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/browser/web_ui.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 
 namespace {
 
 // Adds specified user to the whitelist. Returns false if that user is already
@@ skipping 76 matching lines @@
 
 void AccountsOptionsHandler::HandleUnwhitelistUser(
     const base::ListValue* args) {
   std::string email;
   if (!args->GetString(0, &email)) {
     return;
   }
 
   base::StringValue canonical_email(gaia::CanonicalizeEmail(email));
   CrosSettings::Get()->RemoveFromList(kAccountsPrefUsers, &canonical_email);
-  UserManager::Get()->RemoveUser(email, NULL);
+  user_manager::UserManager::Get()->RemoveUser(email, NULL);
 }
 
 void AccountsOptionsHandler::HandleWhitelistExistingUsers(
     const base::ListValue* args) {
   DCHECK(args && args->empty());
 
   // Creates one list to set. This is needed because user white list update is
   // asynchronous and sequential. Before previous write comes back, cached list
   // is stale and should not be used for appending. See http://crbug.com/127215
   scoped_ptr<base::ListValue> new_list;
 
   CrosSettings* cros_settings = CrosSettings::Get();
   const base::ListValue* existing = NULL;
   if (cros_settings->GetList(kAccountsPrefUsers, &existing) && existing)
     new_list.reset(existing->DeepCopy());
   else
     new_list.reset(new base::ListValue);
 
-  const user_manager::UserList& users = UserManager::Get()->GetUsers();
+  const user_manager::UserList& users =
+      user_manager::UserManager::Get()->GetUsers();
   for (user_manager::UserList::const_iterator it = users.begin();
        it < users.end();
        ++it)
     new_list->AppendIfNotPresent(new base::StringValue((*it)->email()));
 
   cros_settings->Set(kAccountsPrefUsers, *new_list.get());
 }
 
 }  // namespace options
 }  // namespace chromeos