| Index: chrome/browser/importer/importer_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/importer/importer_unittest.cc (revision 4885)
|
| +++ chrome/browser/importer/importer_unittest.cc (working copy)
|
| @@ -189,9 +189,9 @@
|
| ++history_count_;
|
| }
|
|
|
| - virtual void AddBookmarkEntry(
|
| - const std::vector<BookmarkEntry>& bookmark,
|
| - bool check_duplicates) {
|
| + virtual void AddBookmarkEntry(const std::vector<BookmarkEntry>& bookmark,
|
| + const std::wstring& first_folder_name,
|
| + int options) {
|
| // Importer should import the IE Favorites folder the same as the list.
|
| for (size_t i = 0; i < bookmark.size(); ++i) {
|
| if (FindBookmarkEntry(bookmark[i], kIEBookmarks,
|
| @@ -545,7 +545,8 @@
|
| }
|
|
|
| virtual void AddBookmarkEntry(const std::vector<BookmarkEntry>& bookmark,
|
| - bool check_duplicates) {
|
| + const std::wstring& first_folder_name,
|
| + int options) {
|
| for (size_t i = 0; i < bookmark.size(); ++i) {
|
| if (FindBookmarkEntry(bookmark[i], kFirefox2Bookmarks,
|
| arraysize(kFirefox2Bookmarks)))
|
| @@ -745,7 +746,8 @@
|
| }
|
|
|
| virtual void AddBookmarkEntry(const std::vector<BookmarkEntry>& bookmark,
|
| - bool check_duplicates) {
|
| + const std::wstring& first_folder_name,
|
| + int options) {
|
| for (size_t i = 0; i < bookmark.size(); ++i) {
|
| if (FindBookmarkEntry(bookmark[i], kFirefox3Bookmarks,
|
| arraysize(kFirefox3Bookmarks)))
|
| @@ -829,4 +831,3 @@
|
| HISTORY | PASSWORDS | FAVORITES | SEARCH_ENGINES, observer, true));
|
| loop->Run();
|
| }
|
| -
|
|
|