Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Unified Diff: trunk/src/chrome/browser/importer/firefox_importer_browsertest.cc

Issue 15876003: Revert 201968 "Revert 201837 "OOP import on Windows."" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/importer/firefox_importer_browsertest.cc
===================================================================
--- trunk/src/chrome/browser/importer/firefox_importer_browsertest.cc (revision 201976)
+++ trunk/src/chrome/browser/importer/firefox_importer_browsertest.cc (working copy)
@@ -163,7 +163,6 @@
virtual void AddBookmarks(const std::vector<ImportedBookmarkEntry>& 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
@@ -269,9 +268,9 @@
items = items | importer::SEARCH_ENGINES;
// Deletes itself.
- // TODO(gab): Use ExternalProcessImporterHost on both Windows and Linux.
+ // TODO(gab): Use ExternalProcessImporterHost on Linux as well.
ImporterHost* host;
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_WIN)
host = new ExternalProcessImporterHost;
#else
host = new ImporterHost;

Powered by Google App Engine
This is Rietveld 408576698