Many fixes to bookmark importing.

chrome/browser/importer/firefox3_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/firefox3_importer.h"
 
 #include <set>
 
 #include "app/sql/connection.h"
 #include "app/sql/statement.h"
@@ skipping 190 matching lines @@
     NOTREACHED();
     return;
   }
 
   string16 firefox_folder =
       bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_FIREFOX);
   for (size_t i = 0; i < list.size(); ++i) {
     BookmarkItem* item = list[i];
 
     if (item->type == TYPE_FOLDER) {
-      // Folders are added implicitly on adding children,
-      // so now we pass only empty folders to add them explicitly.
+      // Folders are added implicitly on adding children, so we only explicitly
+      // add empty folders.
       if (!item->empty_folder)
         continue;
     } else if (item->type == TYPE_BOOKMARK) {
       // Import only valid bookmarks
       if (!CanImportURL(item->url))
         continue;
     } else {
       continue;
     }
 
     // Skip the default bookmarks and unwanted URLs.
     if (default_urls.find(item->url) != default_urls.end() ||
         post_keyword_ids.find(item->id) != post_keyword_ids.end())
       continue;
 
     // Find the bookmark path by tracing their links to parent folders.
     std::vector<string16> path;
     BookmarkItem* child = item;
     bool found_path = false;
     bool is_in_toolbar = false;
     while (child->parent >= 0) {
       BookmarkItem* parent = list[child->parent];
-      if (parent->id == toolbar_folder_id) {
-        // This bookmark entry should be put in the bookmark bar.
-        // But we put it in the Firefox group after first run, so
-        // that do not mess up the bookmark bar.
-        if (import_to_bookmark_bar()) {
-          is_in_toolbar = true;
-        } else {
-          path.insert(path.begin(), parent->title);
-          path.insert(path.begin(), firefox_folder);
-        }
+      if (livemark_id.find(parent->id) != livemark_id.end()) {
+        // Don't import live bookmarks.
+        break;
+      }
+
+      if (parent->id != menu_folder_id) {
+        // To avoid excessive nesting, omit the name for the bookmarks menu
+        // folder.
+        path.insert(path.begin(), parent->title);
+      }
+
+      if (parent->id == toolbar_folder_id)
+        is_in_toolbar = true;
+
+      if (parent->id == toolbar_folder_id ||
+          parent->id == menu_folder_id ||
+          parent->id == unsorted_folder_id) {
+        // We've reached a root node, hooray!
         found_path = true;
         break;
-      } else if (parent->id == menu_folder_id ||
-                 parent->id == unsorted_folder_id) {
-        // After the first run, the item will be placed in a folder in
-        // the "Other bookmarks".
-        if (!import_to_bookmark_bar())
-          path.insert(path.begin(), firefox_folder);
-        found_path = true;
-        break;
-      } else if (livemark_id.find(parent->id) != livemark_id.end()) {
-        // If the entry is under a livemark folder, we don't import it.
-        break;
       }
-      path.insert(path.begin(), parent->title);
+
       child = parent;
     }
 
     if (!found_path)
       continue;
 
     ProfileWriter::BookmarkEntry entry;
     entry.creation_time = item->date_added;
     entry.title = item->title;
     entry.url = item->url;
@@ skipping 14 matching lines @@
         template_urls.push_back(t_url);
     }
   }
 
   STLDeleteContainerPointers(list.begin(), list.end());
 
   // Write into profile.
   if (!bookmarks.empty() && !cancelled()) {
     const string16& first_folder_name =
         bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_FIREFOX);
-    int options = 0;
-    if (import_to_bookmark_bar())
-      options = ProfileWriter::IMPORT_TO_BOOKMARK_BAR;
-    bridge_->AddBookmarks(bookmarks, first_folder_name, options);
+    bridge_->AddBookmarks(bookmarks, first_folder_name);
   }
   if (!template_urls.empty() && !cancelled()) {
     bridge_->SetKeywords(template_urls, -1, false);
   } else {
     STLDeleteContainerPointers(template_urls.begin(), template_urls.end());
   }
   if (!favicon_map.empty() && !cancelled()) {
     std::vector<history::ImportedFaviconUsage> favicons;
     LoadFavicons(&db, favicon_map, &favicons);
     bridge_->SetFavicons(favicons);
@@ skipping 269 matching lines @@
 
       if (!ReencodeFavicon(&data[0], data.size(), &usage.png_data))
         continue;  // Unable to decode.
 
       usage.urls = i->second;
       favicons->push_back(usage);
     }
     s.Reset();
   }
 }