Fixed an issue with fallback on locked profile upon profile deletion.

chrome/browser/ui/webui/profile_helper.cc

 // Copyright 2016 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/ui/webui/profile_helper.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/keep_alive_types.h"
@@ skipping 25 matching lines @@
                            Profile::CreateStatus status) {
   if (status != Profile::CREATE_STATUS_INITIALIZED)
     return;
 
   OpenNewWindowForProfile(profile);
 }
 
 }  // namespace
 
 void OpenNewWindowForProfile(Profile* profile) {
-  if (signin::IsForceSigninEnabled()) {
+  if (signin::IsForceSigninEnabled() ||
+      profiles::IsProfileLocked(profile->GetPath())) {
     if (!UserManager::IsShowing()) {
       UserManager::Show(base::FilePath(), profiles::USER_MANAGER_NO_TUTORIAL,
                         profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
     }
 
     g_browser_process->profile_manager()->CreateProfileAsync(
         ProfileManager::GetSystemProfilePath(),
         base::Bind(&ShowSigninDialog, profile->GetPath()), base::string16(),
         std::string(), std::string());
 
@@ skipping 13 matching lines @@
     return;
   g_browser_process->profile_manager()->MaybeScheduleProfileForDeletion(
       file_path, base::Bind(&DeleteProfileCallback,
                             base::Passed(base::MakeUnique<ScopedKeepAlive>(
                                 KeepAliveOrigin::PROFILE_HELPER,
                                 KeepAliveRestartOption::DISABLED))),
       deletion_source);
 }
 
 }  // namespace webui