Many fixes to bookmark importing.

chrome/browser/importer/importer_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 // The order of these includes is important.
 #include <windows.h>
 #include <unknwn.h>
@@ skipping 135 matching lines @@
 
       if (equal)
         return true;
     }
   }
   return false;
 }
 
 #if defined(OS_WIN)
 static const BookmarkList kIEBookmarks[] = {
-  {true, 0, {},
+  {true, 1, {L"Links"},
    L"TheLink",
    "http://www.links-thelink.com/"},
-  {true, 1, {L"SubFolderOfLinks"},
+  {true, 2, {L"Links", L"SubFolderOfLinks"},
    L"SubLink",
    "http://www.links-sublink.com/"},
   {false, 0, {},
    L"Google Home Page",
    "http://www.google.com/"},
   {false, 0, {},
    L"TheLink",
    "http://www.links-thelink.com/"},
   {false, 1, {L"SubFolder"},
    L"Title",
@@ skipping 61 matching lines @@
                               history::VisitSource visit_source) {
     // Importer should read the specified URL.
     for (size_t i = 0; i < page.size(); ++i) {
       if (page[i].title() == kIEIdentifyTitle &&
           page[i].url() == GURL(kIEIdentifyUrl))
         ++history_count_;
     }
     EXPECT_EQ(history::SOURCE_IE_IMPORTED, visit_source);
   }
 
-  virtual void AddBookmarks(const std::vector<BookmarkEntry>& bookmark,
-                            const string16& first_folder_name,
-                            int options) OVERRIDE {
+  virtual void AddBookmarks(const std::vector<BookmarkEntry>& bookmarks,
+                            const string16& top_level_folder_name) OVERRIDE {
     // 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,
+    for (size_t i = 0; i < bookmarks.size(); ++i) {
+      if (FindBookmarkEntry(bookmarks[i], kIEBookmarks,
                             arraysize(kIEBookmarks)))
         ++bookmark_count_;
     }
   }
 
   virtual void AddKeyword(std::vector<TemplateURL*> template_url,
                           int default_keyword_index) {
     // TODO(jcampan): bug 1169230: we should test keyword importing for IE.
     // In order to do that we'll probably need to mock the Windows registry.
     NOTREACHED();
@@ skipping 201 matching lines @@
   EXPECT_EQ(L"abcdefghijkl", password);
 
   ASSERT_TRUE(ie7_password::GetUserPassFromData(decrypted_data2, &username,
                                                 &password));
   EXPECT_EQ(L"abcdefghi", username);
   EXPECT_EQ(L"abcdefg", password);
 }
 #endif  // defined(OS_WIN)
 
 static const BookmarkList kFirefox2Bookmarks[] = {
-  {true, 1, {L"Folder"},
+  {true, 2, {L"Bookmarks Toolbar Folder", L"Folder"},
    L"On Toolbar's Subfolder",
    "http://on.toolbar/bookmark/folder"},
-  {true, 0, {},
+  {true, 1, {L"Bookmarks Toolbar Folder"},
    L"On Bookmark Toolbar",
    "http://on.toolbar/bookmark"},
   {false, 1, {L"Folder"},
    L"New Bookmark",
    "http://domain/"},
   {false, 0, {},
    L"<Name>",
    "http://domain.com/q?a=%22er%22&b=%3C%20%20%3E"},
   {false, 0, {},
    L"Google Home Page",
@@ skipping 115 matching lines @@
 
   virtual void AddHistoryPage(const std::vector<history::URLRow>& page,
                               history::VisitSource visit_source) {
     ASSERT_EQ(1U, page.size());
     EXPECT_EQ("http://en-us.www.mozilla.com/", page[0].url().spec());
     EXPECT_EQ(ASCIIToUTF16("Firefox Updated"), page[0].title());
     EXPECT_EQ(history::SOURCE_FIREFOX_IMPORTED, visit_source);
     ++history_count_;
   }
 
-  virtual void AddBookmarks(const std::vector<BookmarkEntry>& bookmark,
-                            const string16& first_folder_name,
-                            int options) OVERRIDE {
-    for (size_t i = 0; i < bookmark.size(); ++i) {
-      if (FindBookmarkEntry(bookmark[i], kFirefox2Bookmarks,
+  virtual void AddBookmarks(const std::vector<BookmarkEntry>& bookmarks,
+                            const string16& top_level_folder_name) OVERRIDE {
+    for (size_t i = 0; i < bookmarks.size(); ++i) {
+      if (FindBookmarkEntry(bookmarks[i], kFirefox2Bookmarks,
                             arraysize(kFirefox2Bookmarks)))
         ++bookmark_count_;
     }
   }
 
   virtual void AddKeywords(const std::vector<TemplateURL*>& template_urls,
                            int default_keyword_index,
                            bool unique_on_host_and_path) {
     for (size_t i = 0; i < template_urls.size(); ++i) {
       // The order might not be deterministic, look in the expected list for
@@ skipping 72 matching lines @@
       source_profile,
       static_cast<Profile*>(NULL),
       importer::HISTORY | importer::PASSWORDS |
       importer::FAVORITES | importer::SEARCH_ENGINES,
       make_scoped_refptr(observer),
       true));
   loop->Run();
 }
 
 static const BookmarkList kFirefox3Bookmarks[] = {
-  {true, 0, {},
+  {true, 1, {L"Bookmarks Toolbar"},
     L"Toolbar",
     "http://site/"},
   {false, 0, {},
     L"Title",
     "http://www.google.com/"},
 };
 
 static const PasswordList kFirefox3Passwords[] = {
   {"http://localhost:8080/", "http://localhost:8080/", "http://localhost:8080/",
     L"loginuser", L"abc", L"loginpass", L"123", false},
@@ skipping 92 matching lines @@
     EXPECT_EQ(ASCIIToUTF16("Google"), page[0].title());
     EXPECT_EQ("http://www.google.com/", page[1].url().spec());
     EXPECT_EQ(ASCIIToUTF16("Google"), page[1].title());
     EXPECT_EQ("http://www.cs.unc.edu/~jbs/resources/perl/perl-cgi/programs/form1-POST.html",
               page[2].url().spec());
     EXPECT_EQ(ASCIIToUTF16("example form (POST)"), page[2].title());
     EXPECT_EQ(history::SOURCE_FIREFOX_IMPORTED, visit_source);
     ++history_count_;
   }
 
-  virtual void AddBookmarks(const std::vector<BookmarkEntry>& bookmark,
-                            const string16& first_folder_name,
-                            int options) OVERRIDE {
-    for (size_t i = 0; i < bookmark.size(); ++i) {
-      if (FindBookmarkEntry(bookmark[i], kFirefox3Bookmarks,
+  virtual void AddBookmarks(const std::vector<BookmarkEntry>& bookmarks,
+                            const string16& top_level_folder_name) OVERRIDE {
+    for (size_t i = 0; i < bookmarks.size(); ++i) {
+      if (FindBookmarkEntry(bookmarks[i], kFirefox3Bookmarks,
                             arraysize(kFirefox3Bookmarks)))
         ++bookmark_count_;
     }
   }
 
   void AddKeywords(const std::vector<TemplateURL*>& template_urls,
                   int default_keyword_index,
                   bool unique_on_host_and_path) {
     for (size_t i = 0; i < template_urls.size(); ++i) {
       // The order might not be deterministic, look in the expected list for
@@ skipping 43 matching lines @@
                         true);
 }
 
 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) {
   bool import_search_engines = false;
   scoped_refptr<Firefox3Observer> observer(
       new Firefox3Observer(import_search_engines));
   Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(),
                         import_search_engines);
 }