Profile deletion: prevent profile creation race in dying browser.

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 "chrome/browser/browser_process.h"
+#include "chrome/browser/lifetime/keep_alive_types.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/user_manager.h"
 #include "chrome/browser/ui/webui/signin/signin_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 
 namespace webui {
 namespace {

[Bernhard Bauer, 2016/11/18 13:31:31]

Can you add an empty line after this one?

 void ShowSigninDialog(base::FilePath signin_profile_path,
                       Profile* system_profile,
                       Profile::CreateStatus status) {
   UserManager::ShowSigninDialog(system_profile, signin_profile_path);
 }
 
 }  // namespace

[Bernhard Bauer, 2016/11/18 13:31:31]

And after this one?

-void OpenNewWindowForProfile(Profile* profile, Profile::CreateStatus status) {
+void OpenNewWindowForProfile(const std::unique_ptr<ScopedKeepAlive>& keep_alive,

[Bernhard Bauer, 2016/11/18 13:31:31]

Both the ScopedKeepAlive and the CreateStatus are only used when this method is
called internally; external callers only care about the aspect of opening a new
window. Could we use a callback in an anonymous namespace for
DeleteProfileAtPath() below that takes the ScopedAlive and the CreateStatus, and
have the method declared in the header only take the profile?

+                             Profile* profile,
+                             Profile::CreateStatus status) {
   if (status != Profile::CREATE_STATUS_INITIALIZED)
     return;
 
   if (signin::IsForceSigninEnabled()) {
     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());
 
   } else {
     profiles::FindOrCreateNewWindowForProfile(
         profile, chrome::startup::IS_PROCESS_STARTUP,
         chrome::startup::IS_FIRST_RUN, false);
   }
 }
 
 void DeleteProfileAtPath(base::FilePath file_path,
                          content::WebUI* web_ui,
                          ProfileMetrics::ProfileDelete deletion_source) {
   DCHECK(web_ui);

[Bernhard Bauer, 2016/11/18 13:31:31]

This parameter seems unnecessary...

 
   if (!profiles::IsMultipleProfilesEnabled())
     return;
   g_browser_process->profile_manager()->MaybeScheduleProfileForDeletion(
-      file_path, base::Bind(&OpenNewWindowForProfile), deletion_source);
+      file_path, base::Bind(&OpenNewWindowForProfile,
+                            base::Passed(base::MakeUnique<ScopedKeepAlive>(
+                                KeepAliveOrigin::PROFILE_HELPER,
+                                KeepAliveRestartOption::DISABLED))),
+      deletion_source);
 }
 
 }  // namespace webui