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

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

Issue 12670013: Out-of-process import on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge up to r196136 + modifications in extracted CLs Created 7 years, 8 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: 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 fb6cc2496484a83b472f0c8331aa78287038555b..d8918b113e38060e99bf01edc9380b478e209acd 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;

Powered by Google App Engine
This is Rietveld 408576698