[cros] Make "New user" sign in consistent.

chrome/browser/chromeos/login/existing_user_controller.cc

 // Copyright (c) 2011 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 575 matching lines @@
   if (WizardController::IsDeviceRegistered()) {
     LoginUtils::Get()->CompleteOffTheRecordLogin(start_url_);
   } else {
     // Postpone CompleteOffTheRecordLogin until registration completion.
     ActivateWizard(WizardController::kRegistrationScreenName);
   }
 }
 
 void ExistingUserController::OnPasswordChangeDetected(
     const GaiaAuthConsumer::ClientLoginResult& credentials) {
-  // When signing in as a "New user" always remove old cryptohome.
-  if (selected_view_index_ == controllers_.size() - 1) {
-    ResyncEncryptedData();
-    return;
-  }
-
   // Must not proceed without signature verification.
   bool trusted_setting_available = user_settings_->RequestTrustedOwner(
       method_factory_.NewRunnableMethod(
           &ExistingUserController::OnPasswordChangeDetected,
           credentials));
   if (!trusted_setting_available) {
     // Value of owner email is still not verified.
     // Another attempt will be invoked after verification completion.
     return;
   }
@@ skipping 46 matching lines @@
     login_performer_->RecoverEncryptedData(old_password);
 }
 
 void ExistingUserController::ResyncEncryptedData() {
   // LoginPerformer instance has state of the user so it should exist.
   if (login_performer_.get())
     login_performer_->ResyncEncryptedData();
 }
 
 }  // namespace chromeos