Improve ephemeral profiles clean up code.

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"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 184 matching lines @@
 #endif
 
 #if defined(USE_AURA)
 #include "ui/aura/env.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
 
+const int64 kEphemeralProfilesCleanUpDelaySec = 10;
+
 // This function provides some ways to test crash and assertion handling
 // behavior of the program.
 void HandleTestParameters(const CommandLine& command_line) {
   // This parameter causes an assertion.
   if (command_line.HasSwitch(switches::kBrowserAssertTest)) {
     DCHECK(false);
   }
 
   // This parameter causes a null pointer crash (crash reporter trigger).
   if (command_line.HasSwitch(switches::kBrowserCrashTest)) {
@@ skipping 820 matching lines @@
   // First check if any ephemeral profiles are left behind because of browser
   // 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));
   }
-  for (size_t i = 0;i < profiles_to_delete.size(); ++i) {
-    profile_manager->ScheduleProfileForDeletion(
-        profiles_to_delete[i], ProfileManager::CreateCallback());
+
+  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 the profiles soon after browser start, but not immediately not
+    // to delay browser start-up.

[rpetterson, 2013/11/04 18:18:59]

Was there noticeable slow down for startup without the delay?

[pastarmovj, 2013/11/05 08:58:17]

To be honest I have never tried. Since I need to post the task to the FILE
thread anyways I thought I will also make it late enough to make sure no
start-up tasks are blocked on deleting potentially large amount of files.
Especially since Windows is known to be slow deleting many small files.

[jochen (gone - plz use gerrit), 2013/11/05 13:03:25]

I don't think we should do that, unless you have data to show that this actually
slows down startup, and delaying it by 10 seconds does not.

[pastarmovj, 2013/11/05 16:11:02]

After discussing this with Jochen. I can see the point of not waiting here until
we gather evidence that this is indeed needed.

+    BrowserThread::PostDelayedTask(
+        BrowserThread::FILE, FROM_HERE,
+        base::Bind(&ProfileManager::CleanUpStaleProfiles, profiles_to_delete),
+        base::TimeDelta::FromSeconds(kEphemeralProfilesCleanUpDelaySec));
   }
 #endif  // OS_ANDROID
 
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PreProfileInit();
 }
 
 void ChromeBrowserMainParts::PostProfileInit() {
   TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit");
   LaunchDevToolsHandlerIfNeeded(parsed_command_line());
@@ skipping 635 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif
 #endif
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }