Index: chrome/browser/importer/firefox_importer_browsertest.cc |
diff --git a/chrome/browser/importer/firefox_importer_browsertest.cc b/chrome/browser/importer/firefox_importer_browsertest.cc |
index 696385bd07a5d917cff67fa37ec2fde24c39fdb9..c1671d65d95374f5273711f9b5e32ed4b69381e5 100644 |
--- a/chrome/browser/importer/firefox_importer_browsertest.cc |
+++ b/chrome/browser/importer/firefox_importer_browsertest.cc |
@@ -332,7 +332,6 @@ class Firefox3Observer : public ProfileWriter, |
virtual void AddBookmarks(const std::vector<BookmarkEntry>& bookmarks, |
const string16& top_level_folder_name) OVERRIDE { |
- |
ASSERT_LE(bookmark_count_ + bookmarks.size(), |
arraysize(kFirefox3Bookmarks)); |
// Importer should import the FF favorites the same as the list, in the same |
@@ -437,9 +436,9 @@ class FirefoxProfileImporterBrowserTest : public InProcessBrowserTest { |
if (import_search_plugins) |
items = items | importer::SEARCH_ENGINES; |
- // TODO(gab): Use ExternalProcessImporterHost on both Windows and Linux. |
+ // TODO(gab): Use ExternalProcessImporterHost on Linux as well. |
scoped_refptr<ImporterHost> host; |
-#if defined(OS_MACOSX) |
+#if defined(OS_MACOSX) || defined(OS_WIN) |
host = new ExternalProcessImporterHost; |
#else |
host = new ImporterHost; |
@@ -482,9 +481,9 @@ IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest, |
source_profile.app_path = app_path_; |
source_profile.source_path = profile_path_; |
- // TODO(gab): Use ExternalProcessImporterHost on both Windows and Linux. |
+ // TODO(gab): Use ExternalProcessImporterHost on Linux as well. |
scoped_refptr<ImporterHost> host; |
-#if defined(OS_MACOSX) |
+#if defined(OS_MACOSX) || defined(OS_WIN) |
host = new ExternalProcessImporterHost; |
#else |
host = new ImporterHost; |