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) {
+  FinishDeletingProfile(profile_dir, GenerateNextProfileDirectoryPath());

[Bernhard Bauer, 2017/02/15 18:03:30]

Just to confirm: This updates the last used profile to a new one, but doesn't
create it yet, correct? If so, a comment to that effect would be nice.

[palar, 2017/02/16 10:39:04]

Exacly.
Upon browser start a new profile at the specified path will be seamlessly
created.
Or if there any other active profiles exists - they overwrite last used profile
setting on window activation or on profile deletion (other profiles expected to
be  ephemeral too).

+}
+
 #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 834 matching lines @@
   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.
-    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) {
 }