Don't create a new profile when cleaning up stale ephemeral profiles.

chrome/browser/chrome_browser_main.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/chrome_browser_main.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 216 matching lines @@
 #endif  // defined(ENABLE_WEBRTC)
 
 #if defined(USE_AURA)
 #include "ui/aura/env.h"
 #endif  // defined(USE_AURA)
 
 using content::BrowserThread;
 
 namespace {
 
+#if !defined(OS_ANDROID)
+// Asserts in debug builds that we don't create a new profile when cleaning up
+// stale ephemeral profiles.
+void DidCreateProfile(Profile* profile, Profile::CreateStatus status) {
+  NOTREACHED();
+}
+#endif  // !defined(OS_ANDROID)
+
 // This function provides some ways to test crash and assertion handling
 // behavior of the program.
 void HandleTestParameters(const base::CommandLine& command_line) {
   // This parameter causes a null pointer crash (crash reporter trigger).
   if (command_line.HasSwitch(switches::kBrowserCrashTest)) {
     int* bad_pointer = NULL;
     *bad_pointer = 0;
   }
 }
 
@@ skipping 838 matching lines @@
   // crash and schedule them for deletion and then proceed with getting the set
   // of profiles to open.
   ProfileInfoCache& profile_cache = profile_manager->GetProfileInfoCache();
   size_t profiles_count = profile_cache.GetNumberOfProfiles();
   std::vector<base::FilePath> profiles_to_delete;
   for (size_t i = 0; i < profiles_count; ++i) {
     if (profile_cache.ProfileIsEphemeralAtIndex(i))
       profiles_to_delete.push_back(profile_cache.GetPathOfProfileAtIndex(i));
   }
 
-  if (profiles_to_delete.size()) {
-    for (size_t i = 0; i < profiles_to_delete.size(); ++i) {
-      profile_manager->ScheduleProfileForDeletion(
-          profiles_to_delete[i], ProfileManager::CreateCallback());
-    }
-    // Clean up stale profiles immediately after browser start.
-    BrowserThread::PostTask(

[Mike Lerman, 2015/05/05 13:44:45]

Why is CleanUpStaleProfiles no longer necessary? Is that because the
ProfileManager now calls NukeFromDisk for unloaded Profile*'s?

[Bernhard Bauer, 2015/05/05 14:33:21]

It already did that before (in FinishDeletingProfile), so I think this call was
simply unnecessary (but no one noticed, because deleting a directory is
idempotent).

-        BrowserThread::FILE, FROM_HERE,
-        base::Bind(&ProfileManager::CleanUpStaleProfiles, profiles_to_delete));
+  for (size_t i = 0; i < profiles_to_delete.size(); ++i) {

[Mike Lerman, 2015/05/05 13:44:45]

Can you put a comment above profiles_to_delete that we still need two loops,
rather than compressing this into one, because ScheduleProfileForDeletion will
muck around with the indices of the profiles in the ProfileInfoCache?

If only the ProfileInfoCache had a method like std::vector<std::string>
GetAllProfilePaths() const.

[Bernhard Bauer, 2015/05/05 14:33:21]

Done.

+    profile_manager->ScheduleProfileForDeletion(
+        profiles_to_delete[i], true /* suppress_profile_creation */,
+        base::Bind(&DidCreateProfile));

[Mike Lerman, 2015/05/05 13:44:45]

I think you can just put a ProfileManager::CreateCallback(), and trust that the
boolean supress_profile_creation does its job.

[Bernhard Bauer, 2015/05/05 14:33:21]

Done.

   }
 #endif  // !defined(OS_ANDROID)
 
 #if defined(ENABLE_EXTENSIONS)
   javascript_dialog_extensions_client::InstallClient();
 #endif  // defined(ENABLE_EXTENSIONS)
 
 #if !defined(OS_IOS)
   InstallChromeJavaScriptNativeDialogFactory();
 #endif  // !defined(OS_IOS)
@@ skipping 681 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif  // defined(OS_CHROMEOS)
 #endif  // defined(OS_ANDROID)
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }