Many fixes to bookmark importing.

chrome/browser/importer/firefox2_importer.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 "chrome/browser/importer/firefox2_importer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
@@ skipping 130 matching lines @@
   t_url->set_keyword(keyword);
   t_url->SetURL(TemplateURLRef::DisplayURLToURLRef(UTF8ToUTF16(url.spec())),
                 0, 0);
   return t_url;
 }
 
 // static
 void Firefox2Importer::ImportBookmarksFile(
     const FilePath& file_path,
     const std::set<GURL>& default_urls,
-    bool import_to_bookmark_bar,
-    const string16& first_folder_name,
     Importer* importer,
     std::vector<ProfileWriter::BookmarkEntry>* bookmarks,
     std::vector<TemplateURL*>* template_urls,
     std::vector<history::ImportedFaviconUsage>* favicons) {
   std::string content;
   file_util::ReadFileToString(file_path, &content);
   std::vector<std::string> lines;
   base::SplitString(content, '\n', &lines);
 
   std::vector<ProfileWriter::BookmarkEntry> toolbar_bookmarks;
-  string16 last_folder = first_folder_name;
+  string16 last_folder;
   bool last_folder_on_toolbar = false;
   bool last_folder_is_empty = true;
   bool has_subfolder = false;
   base::Time last_folder_add_date;
   std::vector<string16> path;
   size_t toolbar_folder = 0;
   std::string charset;
   for (size_t i = 0; i < lines.size() && (!importer || !importer->cancelled());
        ++i) {
     std::string line;
@@ skipping 33 matching lines @@
       if (toolbar_folder > path.size() && !path.empty()) {
         NOTREACHED();  // error in parsing.
         break;
       }
 
       ProfileWriter::BookmarkEntry entry;
       entry.creation_time = add_date;
       entry.url = url;
       entry.title = title;
 
-      if (import_to_bookmark_bar && toolbar_folder) {
-        // Flatten the items in toolbar.
+      if (toolbar_folder) {
+        // The toolbar folder should be at the top level.
         entry.in_toolbar = true;
-        entry.path.assign(path.begin() + toolbar_folder, path.end());
+        entry.path.assign(path.begin() + toolbar_folder - 1, path.end());
         toolbar_bookmarks.push_back(entry);
       } else {
-        // Insert the item into the "Imported from Firefox" folder.
+        // Add this bookmark to the list of |bookmarks|.
         if (!has_subfolder && !last_folder.empty()) {
           path.push_back(last_folder);
           last_folder.clear();
         }
         entry.path.assign(path.begin(), path.end());
-        if (import_to_bookmark_bar) {
-          DCHECK(!entry.path.empty());
-          entry.path.erase(entry.path.begin());
-        }
         bookmarks->push_back(entry);
       }
 
       // Save the favicon. DataURLToFaviconUsage will handle the case where
       // there is no favicon.
       if (favicons)
         DataURLToFaviconUsage(url, favicon, favicons);
 
       if (template_urls) {
         // If there is a SHORTCUT attribute for this bookmark, we
         // add it as our keywords.
         TemplateURL* t_url = CreateTemplateURL(title, shortcut, url);
         if (t_url)
           template_urls->push_back(t_url);
       }
 
       continue;
     }
 
     // Bookmarks in sub-folder are encapsulated with <DL> tag.
     if (StartsWithASCII(line, "<DL>", false)) {
       has_subfolder = true;
-      if (last_folder.length() != 0) {
+      if (!last_folder.empty()) {
         path.push_back(last_folder);
         last_folder.clear();
       }
       if (last_folder_on_toolbar && !toolbar_folder)
         toolbar_folder = path.size();
 
       // Mark next folder empty as initial state.
       last_folder_is_empty = true;
     } else if (StartsWithASCII(line, "</DL>", false)) {
       if (path.empty())
         break;  // Mismatch <DL>.
 
       string16 folder_title = path.back();
       path.pop_back();
 
       if (last_folder_is_empty) {
         // Empty folder should be added explicitly.
         ProfileWriter::BookmarkEntry entry;
         entry.is_folder = true;
         entry.creation_time = last_folder_add_date;
         entry.title = folder_title;
-        if (import_to_bookmark_bar && toolbar_folder) {
-          // Flatten the folder in toolbar.
-          entry.in_toolbar = true;
-          entry.path.assign(path.begin() + toolbar_folder, path.end());
-          toolbar_bookmarks.push_back(entry);
+        if (toolbar_folder) {
+          // The toolbar folder should be at the top level.
+          // Make sure we don't add the toolbar folder itself if it is empty.
+          if (toolbar_folder <= path.size()) {
+            entry.in_toolbar = true;
+            entry.path.assign(path.begin() + toolbar_folder - 1, path.end());
+            toolbar_bookmarks.push_back(entry);
+          }
         } else {
-          // Insert the folder into the "Imported from Firefox" folder.
+          // Add this folder to the list of |bookmarks|.
           entry.path.assign(path.begin(), path.end());
-          if (import_to_bookmark_bar) {
-            DCHECK(!entry.path.empty());
-            entry.path.erase(entry.path.begin());
-          }
           bookmarks->push_back(entry);
         }
 
         // Parent folder include current one, so it's not empty.
         last_folder_is_empty = false;
       }
 
       if (toolbar_folder > path.size())
         toolbar_folder = 0;
     }
   }
 
   bookmarks->insert(bookmarks->begin(), toolbar_bookmarks.begin(),
                     toolbar_bookmarks.end());
 }
 
 void Firefox2Importer::ImportBookmarks() {
   // Load the default bookmarks.
   std::set<GURL> default_urls;
   if (!parsing_bookmarks_html_file_)
     LoadDefaultBookmarks(app_path_, &default_urls);
 
   // Parse the bookmarks.html file.
   std::vector<ProfileWriter::BookmarkEntry> bookmarks, toolbar_bookmarks;
   std::vector<TemplateURL*> template_urls;
   std::vector<history::ImportedFaviconUsage> favicons;
   FilePath file = source_path_;
   if (!parsing_bookmarks_html_file_)
     file = file.AppendASCII("bookmarks.html");
-  string16 first_folder_name = bridge_->GetLocalizedString(
-      parsing_bookmarks_html_file_ ? IDS_BOOKMARK_GROUP :
-                                     IDS_BOOKMARK_GROUP_FROM_FIREFOX);
 
-  ImportBookmarksFile(file, default_urls, import_to_bookmark_bar(),
-                      first_folder_name, this, &bookmarks, &template_urls,
+  ImportBookmarksFile(file, default_urls, this, &bookmarks, &template_urls,
                       &favicons);
 
   // Write data into profile.
   if (!bookmarks.empty() && !cancelled()) {
-    int options = 0;
-    if (import_to_bookmark_bar())
-      options |= ProfileWriter::IMPORT_TO_BOOKMARK_BAR;
-    if (bookmark_bar_disabled())
-      options |= ProfileWriter::BOOKMARK_BAR_DISABLED;
-    bridge_->AddBookmarks(bookmarks, first_folder_name, options);
+    string16 first_folder_name = bridge_->GetLocalizedString(
+        parsing_bookmarks_html_file_ ? IDS_BOOKMARK_GROUP :
+                                       IDS_BOOKMARK_GROUP_FROM_FIREFOX);
+    bridge_->AddBookmarks(bookmarks, first_folder_name);
   }
   if (!parsing_bookmarks_html_file_ && !template_urls.empty() &&
       !cancelled()) {
     bridge_->SetKeywords(template_urls, -1, false);
   } else {
     STLDeleteContainerPointers(template_urls.begin(), template_urls.end());
   }
   if (!favicons.empty())
     bridge_->SetFavicons(favicons);
 }
@@ skipping 335 matching lines @@
 
   // We need to make up a URL for the favicon. We use a version of the page's
   // URL so that we can be sure it will not collide.
   usage.favicon_url = GURL(std::string("made-up-favicon:") + link_url.spec());
 
   // We only have one URL per favicon for Firefox 2 bookmarks.
   usage.urls.insert(link_url);
 
   favicons->push_back(usage);
 }