Index: chrome/browser/first_run/first_run.cc |
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc |
index 255a6da4c41e3ff96fac76976fc0431d87c43e9b..344f1f7b55e40cf6e8f9c4847a27747a39906295 100644 |
--- a/chrome/browser/first_run/first_run.cc |
+++ b/chrome/browser/first_run/first_run.cc |
@@ -28,7 +28,6 @@ |
#include "chrome/browser/importer/importer_list.h" |
#include "chrome/browser/importer/importer_progress_dialog.h" |
#include "chrome/browser/importer/importer_progress_observer.h" |
-#include "chrome/browser/process_singleton.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/search_engines/template_url_service.h" |
#include "chrome/browser/search_engines/template_url_service_factory.h" |
@@ -626,16 +625,8 @@ void AutoImport( |
Profile* profile, |
bool homepage_defined, |
int import_items, |
- int dont_import_items, |
- ProcessSingleton* process_singleton) { |
+ int dont_import_items) { |
#if !defined(USE_AURA) |
- // We need to avoid dispatching new tabs when we are importing because |
- // that will lead to data corruption or a crash. Because there is no UI for |
- // the import process, we pass NULL as the window to bring to the foreground |
- // when a CopyData message comes in; this causes the message to be silently |
- // discarded, which is the correct behavior during the import process. |
- process_singleton->Lock(NULL); |
- |
scoped_refptr<ImporterHost> importer_host; |
// TODO(csilv,mirandac): Out-of-process import has only been qualified on |
// MacOS X, so we will only use it on that platform since it is required. |
@@ -711,7 +702,6 @@ void AutoImport( |
content::RecordAction(UserMetricsAction("FirstRunDef_Accept")); |
- process_singleton->Unlock(); |
first_run::CreateSentinel(); |
#endif // !defined(USE_AURA) |
did_perform_profile_import = true; |