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 1059 matching lines @@
   TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreProfileInit");
 
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PreProfileInit();
 
 #if !defined(OS_ANDROID)
   // Initialize the feedback uploader so it can setup notifications for profile
   // creation.
   feedback::FeedbackProfileObserver::Initialize();
 
-  ProfileManager* profile_manager = g_browser_process->profile_manager();
-
-  // 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));
-  }
-
-  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(
-        BrowserThread::FILE, FROM_HERE,
-        base::Bind(&ProfileManager::CleanUpStaleProfiles, profiles_to_delete));
-  }
+  // Ephemeral profiles may have been left behind if the browser crashed.
+  g_browser_process->profile_manager()->CleanUpEphemeralProfiles();
 #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 680 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);
 }