| 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 c93e49635a498c43cd34ab9aa756fbb838d45a8f..a38644a1724d34cd11375a21175873d66d344ab1 100644
|
| --- a/chrome/browser/first_run/first_run.cc
|
| +++ b/chrome/browser/first_run/first_run.cc
|
| @@ -683,15 +683,7 @@ void AutoImport(
|
| const std::string& import_bookmarks_path) {
|
| #if !defined(USE_AURA)
|
| // Deletes itself.
|
| - ImporterHost* importer_host;
|
| - // TODO(csilv,mirandac): Out-of-process import has only been qualified on
|
| - // MacOS X and Windows, so we will only use it on those platforms.
|
| - // Linux still uses the in-process import (http://crbug.com/56816).
|
| -#if defined(OS_MACOSX) || defined(OS_WIN)
|
| - importer_host = new ExternalProcessImporterHost;
|
| -#else
|
| - importer_host = new ImporterHost;
|
| -#endif
|
| + ImporterHost* importer_host = new ExternalProcessImporterHost;
|
|
|
| base::FilePath local_state_path;
|
| PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
|
| @@ -759,14 +751,7 @@ void AutoImport(
|
|
|
| if (!import_bookmarks_path.empty()) {
|
| // Deletes itself.
|
| - ImporterHost* file_importer_host;
|
| - // TODO(gab): Make Linux use OOP import as well (http://crbug.com/56816) and
|
| - // get rid of these ugly ifdefs.
|
| -#if defined(OS_MACOSX) || defined(OS_WIN)
|
| - file_importer_host = new ExternalProcessImporterHost;
|
| -#else
|
| - file_importer_host = new ImporterHost;
|
| -#endif
|
| + ImporterHost* file_importer_host = new ExternalProcessImporterHost;
|
| file_importer_host->set_headless();
|
|
|
| ImportFromFile(profile, file_importer_host, import_bookmarks_path);
|
|
|