Revert 201837 "OOP import on Windows."

trunk/src/chrome/browser/ui/webui/options/import_data_handler.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/ui/webui/options/import_data_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 91 matching lines @@
       importer_list_->GetSourceProfileAt(browser_index);
   uint16 supported_items = source_profile.services_supported;
 
   uint16 import_services = (selected_items & supported_items);
   if (import_services) {
     base::FundamentalValue state(true);
     web_ui()->CallJavascriptFunction("ImportDataOverlay.setImportingState",
                                      state);
     import_did_succeed_ = false;
 
-    // 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)
-    // The Google Toolbar importer doesn't work for the out-of-process import.
-    // This is the only entry point for this importer (it is never used on first
-    // run). See discussion on http://crbug.com/219419 for details.
-    if (source_profile.importer_type == importer::TYPE_GOOGLE_TOOLBAR5)
-      importer_host_ = new ImporterHost;
-    else
-      importer_host_ = new ExternalProcessImporterHost;
+    // 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)
+    importer_host_ = new ExternalProcessImporterHost;
 #else
     importer_host_ = new ImporterHost;
 #endif
     importer_host_->SetObserver(this);
     importer_host_->set_browser(
         chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()));
     Profile* profile = Profile::FromWebUI(web_ui());
     importer_host_->StartImportSettings(source_profile, profile,
                                         import_services,
                                         new ProfileWriter(profile));
@@ skipping 59 matching lines @@
     web_ui()->CallJavascriptFunction("ImportDataOverlay.confirmSuccess");
   } else {
     base::FundamentalValue state(false);
     web_ui()->CallJavascriptFunction("ImportDataOverlay.setImportingState",
                                      state);
     web_ui()->CallJavascriptFunction("ImportDataOverlay.dismiss");
   }
 }
 
 }  // namespace options