Fix some merge issues from merge of 66690 (r66830) and 66933 (r66934)

chrome/browser/chromeos/login/existing_user_controller.cc

 // Copyright (c) 2010 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 <algorithm>
 #include <functional>
 #include <map>
 
@@ skipping 480 matching lines @@
     bool pending_requests) {
   // LoginPerformer instance will delete itself once online auth result is OK.
   // In case of failure it'll bring up ScreenLock and ask for
   // 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);
   LoginPerformer* performer = login_performer_.release();
   performer = NULL;
   bool known_user = UserManager::Get()->IsKnownUser(username);
-  if (credentials.two_factor && !known_user && !start_url_.is_valid()) {
-    // If we have a two factor error and and this is a new user and we are not
-    // already directing the user to a start url (e.g. a help page),
-    // direct them to the personal settings page.
-    // TODO(stevenjb): direct the user to a lightweight sync login page.
-    start_url_ = GURL(kSettingsSyncLoginUrl);
-  }
   AppendStartUrlToCmdline();
   if (selected_view_index_ + 1 == controllers_.size() && !known_user) {
 #if defined(OFFICIAL_BUILD)
     CommandLine::ForCurrentProcess()->AppendSwitchPath(
         switches::kLoadExtension,
         FilePath(kGetStartedPath));
     CommandLine::ForCurrentProcess()->AppendArg(kGetStartedURL);
 #endif  // OFFICIAL_BUILD
+    if (credentials.two_factor) {
+      // If we have a two factor error and and this is a new user and we are not
+      // already directing the user to a start url (e.g. a help page),
+      // direct them to the personal settings page.
+      // TODO(stevenjb): direct the user to a lightweight sync login page.
+      CommandLine::ForCurrentProcess()->AppendArg(kSettingsSyncLoginUrl);
+    }
     // For new user login don't launch browser until we pass image screen.
     LoginUtils::Get()->EnableBrowserLaunch(false);
     LoginUtils::Get()->CompleteLogin(username, password, credentials);
     ActivateWizard(WizardController::IsDeviceRegistered() ?
         WizardController::kUserImageScreenName :
         WizardController::kRegistrationScreenName);
   } else {
     // Hide the login windows now.
     WmIpc::Message message(WM_IPC_MESSAGE_WM_HIDE_LOGIN);
     WmIpc::instance()->SendMessage(message);
@@ skipping 68 matching lines @@
 void ExistingUserController::RecoverEncryptedData(
     const std::string& old_password) {
   login_performer_->RecoverEncryptedData(old_password);
 }
 
 void ExistingUserController::ResyncEncryptedData() {
   login_performer_->ResyncEncryptedData();
 }
 
 }  // namespace chromeos