Revert 201968 "Revert 201837 "OOP import on Windows.""

trunk/src/chrome/browser/importer/ie_importer_browsertest_win.cc

 // Copyright (c) 2013 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.
 
 // The order of these includes is important.
 #include <windows.h>
 #include <unknwn.h>
 #include <intshcut.h>
 #include <shlguid.h>
 #include <urlhist.h>
@@ skipping 12 matching lines @@
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_propvariant.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/bookmarks/imported_bookmark_entry.h"
 #include "chrome/browser/favicon/imported_favicon_usage.h"
+#include "chrome/browser/importer/external_process_importer_host.h"
 #include "chrome/browser/importer/ie_importer.h"
 #include "chrome/browser/importer/ie_importer_utils_win.h"
 #include "chrome/browser/importer/ie_importer_test_registry_overrider_win.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
 #include "chrome/browser/importer/importer_unittest_utils.h"
 #include "chrome/browser/importer/pstore_declarations.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 434 matching lines @@
   // Sets up a special history link.
   base::win::ScopedComPtr<IUrlHistoryStg2> url_history_stg2;
   res = url_history_stg2.CreateInstance(CLSID_CUrlHistory, NULL,
                                         CLSCTX_INPROC_SERVER);
   ASSERT_TRUE(res == S_OK);
   res = url_history_stg2->AddUrl(kIEIdentifyUrl, kIEIdentifyTitle, 0);
   ASSERT_TRUE(res == S_OK);
 
   // Starts to import the above settings.
   // Deletes itself.
-  // TODO(gab): Use ExternalProcessImporterHost on Windows.
-  ImporterHost* host = new ImporterHost;
+  ImporterHost* host = new ExternalProcessImporterHost;
   TestObserver* observer = new TestObserver();
   host->SetObserver(observer);
 
   importer::SourceProfile source_profile;
   source_profile.importer_type = importer::TYPE_IE;
   source_profile.source_path = temp_dir_.path();
 
   host->StartImportSettings(
       source_profile,
       browser()->profile(),
@@ skipping 55 matching lines @@
     base::string16 key_path(importer::GetIEFavoritesOrderKey());
     base::win::RegKey key;
     ASSERT_EQ(ERROR_SUCCESS,
               key.Create(HKEY_CURRENT_USER, key_path.c_str(), KEY_WRITE));
     ASSERT_EQ(ERROR_SUCCESS,
               key.WriteValue(L"Order", kBadBinary[i].data, kBadBinary[i].length,
                              REG_BINARY));
 
     // Starts to import the above settings.
     // Deletes itself.
-    // TODO(gab): Use ExternalProcessImporterHost on Windows.
-    ImporterHost* host = new ImporterHost;
+    ImporterHost* host = new ExternalProcessImporterHost;
     MalformedFavoritesRegistryTestObserver* observer =
         new MalformedFavoritesRegistryTestObserver();
     host->SetObserver(observer);
 
     importer::SourceProfile source_profile;
     source_profile.importer_type = importer::TYPE_IE;
     source_profile.source_path = temp_dir_.path();
 
     host->StartImportSettings(
         source_profile,
         browser()->profile(),
         importer::FAVORITES,
         observer);
     MessageLoop::current()->Run();
   }
 }