Merge 176800

chrome/browser/chromeos/login/existing_user_controller.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/existing_user_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 678 matching lines @@
   // correct password/display error message.
   // Even in case when following online,offline protocol and returning
   // requests_pending = false, let LoginPerformer delete itself.
   login_performer_->set_delegate(NULL);
   ignore_result(login_performer_.release());
 
   // Will call OnProfilePrepared() in the end.
   LoginUtils::Get()->PrepareProfile(username,
                                     display_email_,
                                     password,
-                                    pending_requests,
                                     using_oauth,
                                     has_cookies,
                                     this);
 
   display_email_.clear();
 
   // Notify LoginDisplay to allow it provide visual feedback to user.
   login_display_->OnLoginSuccess(username);
 }
 
@@ skipping 281 matching lines @@
       break;
   }
 
   login_display_->ShowError(error_id, num_login_attempts_, help_topic_id);
 }
 
 void ExistingUserController::ShowGaiaPasswordChanged(
     const std::string& username) {
   // Invalidate OAuth token, since it can't be correct after password is
   // changed.
-  UserManager::Get()->SaveUserOAuthStatus(username,
-                                          User::OAUTH_TOKEN_STATUS_INVALID);
+  UserManager::Get()->SaveUserOAuthStatus(
+      username,
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kForceOAuth1) ?
+          User::OAUTH1_TOKEN_STATUS_INVALID :
+          User::OAUTH2_TOKEN_STATUS_INVALID);
 
   login_display_->SetUIEnabled(true);
   login_display_->ShowGaiaPasswordChanged(username);
 }
 
 }  // namespace chromeos