| Index: chrome/browser/ui/webui/options/import_data_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc
|
| index 5b2d449ce5ab7de409e5d62b209fc1f5ab357409..dbb572ffd66b7cabf4faa6b18db5b9915e856430 100644
|
| --- a/chrome/browser/ui/webui/options/import_data_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/import_data_handler.cc
|
| @@ -109,11 +109,9 @@ void ImportDataHandler::ImportData(const ListValue* args) {
|
| state);
|
| import_did_succeed_ = false;
|
|
|
| - // TODO(csilv): Out-of-process import has only been qualified on MacOS X,
|
| - // so we will only use it on that platform since it is required. Remove this
|
| - // conditional logic once oop import is qualified for Linux/Windows.
|
| - // http://crbug.com/22142
|
| -#if defined(OS_MACOSX)
|
| + // 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)
|
| importer_host_ = new ExternalProcessImporterHost;
|
| #else
|
| importer_host_ = new ImporterHost;
|
|
|