chrome/browser/importer/firefox_importer_browsertest.cc - Issue 14575004: Extract BookmarksFileImporter from Firefox2Importer.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 14575004: Extract BookmarksFileImporter from Firefox2Importer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: test cleanup 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

« chrome/browser/bookmarks/bookmark_html_reader_unittest.cc ('K') | « chrome/browser/importer/firefox3_importer.cc ('k') | chrome/browser/importer/firefox_importer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 d4f1b897fe4b6e73ea62b3411cbd6b94916611db..991012f0b9c841903a6aecece664a7e2d1e2672d 100644

--- a/chrome/browser/importer/firefox_importer_browsertest.cc

+++ b/chrome/browser/importer/firefox_importer_browsertest.cc

@@ -11,7 +11,8 @@

#include "base/string16.h"

#include "base/string_util.h"

#include "base/utf_string_conversions.h"

-#include "chrome/browser/history/history_types.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/firefox_importer_unittest_utils.h"

#include "chrome/browser/importer/importer_data_types.h"

@@ -174,7 +175,7 @@ class FirefoxObserver : public ProfileWriter,

++history_count_;

}

- virtual void AddBookmarks(const std::vector<BookmarkEntry>& bookmarks,

+ virtual void AddBookmarks(const std::vector<ImportedBookmarkEntry>& bookmarks,

const string16& top_level_folder_name) OVERRIDE {

ASSERT_LE(bookmark_count_ + bookmarks.size(),

arraysize(kFirefox2Bookmarks));

@@ -209,7 +210,7 @@ class FirefoxObserver : public ProfileWriter,

}

virtual void AddFavicons(

- const std::vector<history::ImportedFaviconUsage>& favicons) OVERRIDE {

+ const std::vector<ImportedFaviconUsage>& favicons) OVERRIDE {

}

private:

@@ -330,7 +331,7 @@ class Firefox3Observer : public ProfileWriter,