ChromeOS user_manager: move all KnownUser code to separate file.

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.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/ui/webui/chromeos/login/gaia_screen_handler.h"
 
 #include "ash/system/chromeos/devicetype_utils.h"
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/logging.h"
@@ skipping 17 matching lines @@
 #include "chrome/browser/ui/webui/signin/inline_login_ui.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/login/auth/user_context.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "chromeos/system/devicetype.h"
 #include "chromeos/system/version_loader.h"
 #include "components/login/localized_values_builder.h"
+#include "components/user_manager/known_user.h"
 #include "components/user_manager/user_manager.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
@@ skipping 314 matching lines @@
   if (offline_login_is_active() ||
       IsOnline(captive_portal_status_) == IsOnline(previous_status) ||
       disable_restrictive_proxy_check_for_test_ ||
       GetCurrentScreen() != OobeUI::SCREEN_GAIA_SIGNIN)
     return;
 
   LoadAuthExtension(true /* force */, false /* offline */);
 }
 
 void GaiaScreenHandler::HandleIdentifierEntered(const std::string& user_email) {
-  if (!Delegate()->IsUserWhitelisted(
-          user_manager::UserManager::Get()->GetKnownUserAccountId(
-              user_email, std::string() /* gaia_id */)))
+  if (!Delegate()->IsUserWhitelisted(user_manager::known_user::GetAccountId(
+          user_email, std::string() /* gaia_id */)))
     ShowWhitelistCheckFailedError();
 }
 
 void GaiaScreenHandler::HandleWebviewLoadAborted(
     const std::string& error_reason_str) {
   // TODO(nkostylev): Switch to int code once webview supports that.
   // http://crbug.com/470483
   if (error_reason_str == "ERR_ABORTED") {
     LOG(WARNING) << "Ignoring Gaia webview error: " << error_reason_str;
     return;
@@ skipping 23 matching lines @@
   frame_state_ = FRAME_STATE_ERROR;
   UpdateState(error_reason);
 }
 
 AccountId GaiaScreenHandler::GetAccountId(
     const std::string& authenticated_email,
     const std::string& gaia_id) const {
   const std::string canonicalized_email =
       gaia::CanonicalizeEmail(gaia::SanitizeEmail(authenticated_email));
 
-  const AccountId account_id = user_manager::UserManager::GetKnownUserAccountId(
-      authenticated_email, gaia_id);
+  const AccountId account_id =
+      user_manager::known_user::GetAccountId(authenticated_email, gaia_id);
 
   if (account_id.GetUserEmail() != canonicalized_email) {
     LOG(WARNING) << "Existing user '" << account_id.GetUserEmail()
                  << "' authenticated by alias '" << canonicalized_email << "'.";
   }
 
   return account_id;
 }
 
 void GaiaScreenHandler::HandleCompleteAuthentication(
@@ skipping 229 matching lines @@
       (network_state_informer_->state() != NetworkStateInformer::ONLINE ||
        gaia_silent_load_network_ != active_network_path)) {
     // Network has changed. Force Gaia reload.
     gaia_silent_load_ = false;
   }
 
   // Note that LoadAuthExtension clears |populated_email_|.
   if (populated_email_.empty()) {
     Delegate()->LoadSigninWallpaper();
   } else {
-    Delegate()->LoadWallpaper(
-        user_manager::UserManager::Get()->GetKnownUserAccountId(
-            populated_email_, std::string()));
+    Delegate()->LoadWallpaper(user_manager::known_user::GetAccountId(
+        populated_email_, std::string()));
   }
 
   input_method::InputMethodManager* imm =
       input_method::InputMethodManager::Get();
 
   scoped_refptr<input_method::InputMethodManager::State> gaia_ime_state =
       imm->GetActiveIMEState()->Clone();
   imm->SetState(gaia_ime_state);
 
   // Set Least Recently Used input method for the user.
@@ skipping 80 matching lines @@
                                           bool offline) {
   VLOG(1) << "LoadAuthExtension, force: " << force
           << ", offline: " << offline;
   GaiaContext context;
   context.force_reload = force;
   context.use_offline = offline;
   context.email = populated_email_;
 
   std::string gaia_id;
   if (!context.email.empty() &&
-      user_manager::UserManager::Get()->FindGaiaID(
+      user_manager::known_user::FindGaiaID(
           AccountId::FromUserEmail(context.email), &gaia_id)) {
     context.gaia_id = gaia_id;
   }
 
   if (!context.email.empty()) {
-    context.gaps_cookie =
-        user_manager::UserManager::Get()->GetKnownUserGAPSCookie(
-            AccountId::FromUserEmail(gaia::CanonicalizeEmail(context.email)));
+    context.gaps_cookie = user_manager::known_user::GetGAPSCookie(
+        AccountId::FromUserEmail(gaia::CanonicalizeEmail(context.email)));
   }
 
   populated_email_.clear();
 
   LoadGaia(context);
 }
 
 void GaiaScreenHandler::UpdateState(NetworkError::ErrorReason reason) {
   if (signin_screen_handler_)
     signin_screen_handler_->UpdateState(reason);
 }
 
 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
   return signin_screen_handler_->delegate_;
 }
 
 bool GaiaScreenHandler::IsRestrictiveProxy() const {
   return !disable_restrictive_proxy_check_for_test_ &&
          !IsOnline(captive_portal_status_);
 }
 
 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() {
   disable_restrictive_proxy_check_for_test_ = true;
 }
 
 }  // namespace chromeos