Merge 176800

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"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/device_local_account_policy_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "grit/generated_resources.h"
 #include "net/cookies/cookie_monster.h"
@@ skipping 14 matching lines @@
 
 LoginPerformer::LoginPerformer(Delegate* delegate)
     : ALLOW_THIS_IN_INITIALIZER_LIST(online_attempt_host_(this)),
       last_login_failure_(LoginFailure::None()),
       delegate_(delegate),
       password_changed_(false),
       password_changed_callback_count_(0),
       screen_lock_requested_(false),
       initial_online_auth_pending_(false),
       auth_mode_(AUTH_MODE_INTERNAL),
-      using_oauth_(
-          !CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kSkipOAuthLogin)),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   DCHECK(default_performer_ == NULL)
       << "LoginPerformer should have only one instance.";
   default_performer_ = this;
 }
 
 LoginPerformer::~LoginPerformer() {
   DVLOG(1) << "Deleting LoginPerformer";
   DCHECK(default_performer_ != NULL) << "Default instance should exist.";
   default_performer_ = NULL;
@@ skipping 64 matching lines @@
   // 0 - New regular user, login success offline and online.
   //     - or -
   //     Existing regular user, login success offline and online, offline
   //     authentication took longer than online authentication.
   //     - or -
   //     Public account user, login successful.
   // 1 - Existing regular user, login success offline only.
   UMA_HISTOGRAM_ENUMERATION("Login.SuccessReason", pending_requests, 2);
 
   VLOG(1) << "LoginSuccess, pending_requests " << pending_requests;
-  if (delegate_) {
-    // After delegate_->OnLoginSuccess(...) is called, delegate_ releases
-    // LoginPerformer ownership. LP now manages it's lifetime on its own.
-    // 2 things could make it exist longer:
-    // 1. ScreenLock active (pending correct new password input)
-    // 2. Pending online auth request.
-    if (!pending_requests)
-      MessageLoop::current()->DeleteSoon(FROM_HERE, this);
-    else
-      initial_online_auth_pending_ = true;
+  DCHECK(delegate_);
+  // After delegate_->OnLoginSuccess(...) is called, delegate_ releases
+  // LoginPerformer ownership. LP now manages it's lifetime on its own.
+  // 2 things could make it exist longer:
+  // 1. ScreenLock active (pending correct new password input)
+  // 2. Pending online auth request.
+  if (!pending_requests)
+    MessageLoop::current()->DeleteSoon(FROM_HERE, this);
+  else
+    initial_online_auth_pending_ = true;
 
-    delegate_->OnLoginSuccess(username,
-                              password,
-                              pending_requests,
-                              using_oauth);
-    return;
-  } else {
-    // Online login has succeeded.
-    DCHECK(!pending_requests)
-        << "Pending request w/o delegate_ should not happen!";
-    // It is not guaranted, that profile creation has been finished yet. So use
-    // async version here.
-    ProfileManager::CreateDefaultProfileAsync(
-        base::Bind(&LoginPerformer::OnProfileCreated,
-                   weak_factory_.GetWeakPtr()));
-  }
-}
-
-void LoginPerformer::OnProfileCreated(
-    Profile* profile,
-    Profile::CreateStatus status) {
-  CHECK(profile);
-  switch (status) {
-    case Profile::CREATE_STATUS_INITIALIZED:
-      break;
-    case Profile::CREATE_STATUS_CREATED:
-      return;
-    case Profile::CREATE_STATUS_FAIL:
-    default:
-      NOTREACHED();
-      return;
-  }
-
-  if (using_oauth_)
-    LoginUtils::Get()->StartTokenServices(profile);
-
-  // Don't unlock screen if it was locked while we're waiting
-  // for initial online auth.
-  if (ScreenLocker::default_screen_locker() &&
-      !initial_online_auth_pending_) {
-    DVLOG(1) << "Online login OK - unlocking screen.";
-    RequestScreenUnlock();
-    // Do not delete itself just yet, wait for unlock.
-    // See ResolveScreenUnlocked().
-    return;
-  }
-  initial_online_auth_pending_ = false;
-  // There's nothing else that's holding LP from deleting itself -
-  // no ScreenLock, no pending requests.
-  MessageLoop::current()->DeleteSoon(FROM_HERE, this);
+  delegate_->OnLoginSuccess(username,
+                            password,
+                            pending_requests,
+                            using_oauth);
 }
 
 void LoginPerformer::OnOffTheRecordLoginSuccess() {
   content::RecordAction(
       UserMetricsAction("Login_GuestLoginSuccess"));
 
   if (delegate_)
     delegate_->OnOffTheRecordLoginSuccess();
   else
     NOTREACHED();
@@ skipping 339 matching lines @@
                    profile,
                    username_,
                    password_,
                    std::string(),
                    std::string()));
   }
   password_.clear();
 }
 
 }  // namespace chromeos