Switch from SignedSettings to DeviceSettingsService.

chrome/browser/chromeos/login/login_performer.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/chromeos/login/login_performer.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 242 matching lines @@
       screen_lock_requested_ = false;
       ResolveScreenLocked();
     }
   } else {
     ResolveScreenUnlocked();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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;
 
   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::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_)
         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;
     }
   }
 
   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();
+    switch (auth_mode_) {
+      case AUTH_MODE_EXTENSION:
+        StartLoginCompletion();
+        break;
+      case AUTH_MODE_INTERNAL:
+        StartAuthentication();
+        break;
+    }
   } 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;
-    }
-  }
-
-  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);
     else
       NOTREACHED();
   }
 }
 
 void LoginPerformer::LoginDemoUser() {
   authenticator_ = LoginUtils::Get()->CreateAuthenticator(this);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&Authenticator::LoginDemoUser, authenticator_.get()));
@@ skipping 214 matching lines @@
                    profile,
                    username_,
                    password_,
                    std::string(),
                    std::string()));
   }
   password_.clear();
 }
 
 }  // namespace chromeos