Switch from SignedSettings to DeviceSettingsService.

chrome/browser/chromeos/login/login_performer.cc

Index: chrome/browser/chromeos/login/login_performer.cc
diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc
index 3c00da253c9afa4ae104f051df9b16854326cff3..1b800a3c36fd940a4333c00371b58acc8f8adcf0 100644
--- a/chrome/browser/chromeos/login/login_performer.cc
+++ b/chrome/browser/chromeos/login/login_performer.cc
@@ -260,9 +260,10 @@ void LoginPerformer::Observe(int type,
 
 ////////////////////////////////////////////////////////////////////////////////
 // LoginPerformer, public:
-void LoginPerformer::CompleteLogin(const std::string& username,
-                                   const std::string& password) {
-  auth_mode_ = AUTH_MODE_EXTENSION;
+void LoginPerformer::PerformLogin(const std::string& username,

[Nikita (slow), 2012/08/08 09:46:36]

Why it is being renamed?
The point of "CompleteLogin" was that it actually completing login on ChromeOS
side after GAIA login is done.

[Nikita (slow), 2012/08/08 10:28:39]

Ok, I think it makes sense to combine these.

+                                  const std::string& password,
+                                  AuthorizationMode auth_mode) {
+  auth_mode_ = auth_mode;
   username_ = username;
   password_ = password;
 
@@ -273,9 +274,9 @@ void LoginPerformer::CompleteLogin(const std::string& username,
   if (!ScreenLocker::default_screen_locker()) {
     CrosSettingsProvider::TrustedStatus status =
         cros_settings->PrepareTrustedValues(
-            base::Bind(&LoginPerformer::CompleteLogin,
+            base::Bind(&LoginPerformer::PerformLogin,
                        weak_factory_.GetWeakPtr(),
-                       username, password));
+                       username, password, auth_mode));
     // Must not proceed without signature verification.
     if (status == CrosSettingsProvider::PERMANENTLY_UNTRUSTED) {
       if (delegate_)
@@ -293,50 +294,14 @@ void LoginPerformer::CompleteLogin(const std::string& username,
   bool is_whitelisted = LoginUtils::IsWhitelisted(
       gaia::CanonicalizeEmail(username));
   if (ScreenLocker::default_screen_locker() || is_whitelisted) {
-    // Starts authentication if guest login is allowed or online auth pending.
-    StartLoginCompletion();
-  } else {
-    if (delegate_)
-      delegate_->WhiteListCheckFailed(username);
-    else
-      NOTREACHED();
-  }
-}
-
-void LoginPerformer::Login(const std::string& username,
-                           const std::string& password) {
-  auth_mode_ = AUTH_MODE_INTERNAL;
-  username_ = username;
-  password_ = password;
-
-  CrosSettings* cros_settings = CrosSettings::Get();
-
-  // Whitelist check is always performed during initial login and
-  // should not be performed when ScreenLock is active (pending online auth).
-  if (!ScreenLocker::default_screen_locker()) {
-    CrosSettingsProvider::TrustedStatus status =
-        cros_settings->PrepareTrustedValues(
-            base::Bind(&LoginPerformer::Login,
-                       weak_factory_.GetWeakPtr(),
-                       username, password));
-    // Must not proceed without signature verification.
-    if (status == CrosSettingsProvider::PERMANENTLY_UNTRUSTED) {
-      if (delegate_)
-        delegate_->PolicyLoadFailed();
-      else
-        NOTREACHED();
-      return;
-    } else if (status != CrosSettingsProvider::TRUSTED) {
-      // Value of AllowNewUser setting is still not verified.
-      // Another attempt will be invoked after verification completion.
-      return;
+    switch (auth_mode_) {
+      case AUTH_MODE_EXTENSION:
+        StartLoginCompletion();
+        break;
+      case AUTH_MODE_INTERNAL:
+        StartAuthentication();
+        break;
     }
-  }
-
-  bool is_whitelisted = LoginUtils::IsWhitelisted(username);
-  if (ScreenLocker::default_screen_locker() || is_whitelisted) {
-    // Starts authentication if guest login is allowed or online auth pending.
-    StartAuthentication();
   } else {
     if (delegate_)
       delegate_->WhiteListCheckFailed(username);