Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Unified Diff: chrome/browser/profiles/profile_manager.cc

Issue 12314093: Capture the exit status of the first-run AutoImport and make it available to tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable WaitForImport on Linux Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_manager.cc
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index c08f9a11e1535547eb4fda5079b10e9a69d73b70..f445d0017136412a708adf716fec4cdc965ff6b6 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -77,8 +77,6 @@ using content::UserMetricsAction;
namespace {
-static bool did_perform_profile_import = false;
-
// Profiles that should be deleted on shutdown.
std::vector<base::FilePath>& ProfilesToDelete() {
CR_DEFINE_STATIC_LOCAL(std::vector<base::FilePath>, profiles_to_delete, ());
@@ -661,18 +659,12 @@ bool ProfileManager::IsImportProcess(const CommandLine& command_line) {
command_line.HasSwitch(switches::kImportFromFile));
}
-// static
-bool ProfileManager::DidPerformProfileImport() {
- return did_perform_profile_import;
-}
-
void ProfileManager::SetWillImport() {
will_import_ = true;
}
void ProfileManager::OnImportFinished(Profile* profile) {
will_import_ = false;
- did_perform_profile_import = true;
DCHECK(profile);
#if !defined(OS_CHROMEOS)

Powered by Google App Engine
This is Rietveld 408576698