Forced ephemeral profile deletion on browser removal crash fix.

chrome/browser/profiles/profile_manager.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/profiles/profile_manager.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <set>
@@ skipping 794 matching lines @@
     // deletion is also cancelled. (crbug.com/289390)
     BrowserList::CloseAllBrowsersWithProfile(
         profile,
         base::Bind(&ProfileManager::EnsureActiveProfileExistsBeforeDeletion,
                    base::Unretained(this), callback),
         base::Bind(&CancelProfileDeletion));
   } else {
     EnsureActiveProfileExistsBeforeDeletion(callback, profile_dir);
   }
 }
+
+void ProfileManager::ScheduleForcedEphemeralProfileForDeletion(
+    const base::FilePath& profile_dir) {

[Mike Lerman, 2017/03/01 14:24:29]

If this is supposed to only be used for Ephemeral profiles, can we add a DCHECK
here that the profile specified by profile_dir is in fact ephemeral?

[palar, 2017/03/01 16:51:44]

It would be an overkill, but hey, why not.

+  FinishDeletingProfile(profile_dir, GenerateNextProfileDirectoryPath());
+}
+
 #endif  // !defined(OS_ANDROID)
 
 void ProfileManager::AutoloadProfiles() {
   // If running in the background is disabled for the browser, do not autoload
   // any profiles.
   PrefService* local_state = g_browser_process->local_state();
   DCHECK(local_state);
   if (!local_state->HasPrefPath(prefs::kBackgroundModeEnabled) ||
       !local_state->GetBoolean(prefs::kBackgroundModeEnabled)) {
     return;
@@ skipping 833 matching lines @@
   // Do nothing if the closed window is not the last window of the same profile.
   for (auto* browser : *BrowserList::GetInstance()) {
     if (browser->profile()->GetOriginalProfile() == original_profile)
       return;
   }
 
   base::FilePath path = profile->GetPath();
   if (IsProfileDirectoryMarkedForDeletion(path)) {
     // Do nothing if the profile is already being deleted.
   } else if (profile->GetPrefs()->GetBoolean(prefs::kForceEphemeralProfiles)) {
     // Delete if the profile is an ephemeral profile.

[Mike Lerman, 2017/03/01 14:24:29]

We're skipping the call to BrowserList::CloseAllBrowsersWithProfile. That seems
unwise - we should make sure we do this call, I think? Bernhard, wdyt?

[palar, 2017/03/01 16:51:44]

This call happened only on last browser with this profile is about to be closed.

[Mike Lerman, 2017/03/01 17:44:30]

Ok. If we're not going to make sure programmatically that all the Browsers are
closed (either by calling CloseAll, or by DCHECKing that the list of browsers
for this profile has size 0), then please at least leave a comment.

Although I've often been of the opinion that writing:
// This state should be true
is a poor man's version of
DCHECK(state is true).

[palar, 2017/03/01 19:11:22]

DCHECK I can do.

-    g_browser_process->profile_manager()->ScheduleProfileForDeletion(
-        path, ProfileManager::CreateCallback());
+    g_browser_process->profile_manager()
+        ->ScheduleForcedEphemeralProfileForDeletion(path);
   } else {
 #if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_CHROMEOS)
     // Gather statistics and store into ProfileInfoCache. For incognito profile
     // we gather the statistics of its parent profile instead, because a window
     // of the parent profile was open.
     if (!profile->IsSystemProfile() && !original_profile->IsSystemProfile()) {
       ProfileStatisticsFactory::GetForProfile(original_profile)->
           GatherStatistics(profiles::ProfileStatisticsCallback());
     }
 #endif
@@ skipping 43 matching lines @@
 
   FinishDeletingProfile(profile_to_delete_path, new_active_profile_path);
   if (!original_callback.is_null())
     original_callback.Run(loaded_profile, status);
 }
 #endif  // !defined(OS_ANDROID)
 
 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
     const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
 }