Remove the dependence of the Firefox 3 importer on the Firefox 2 importer.

chrome/browser/importer/firefox3_importer.cc

Index: chrome/browser/importer/firefox3_importer.cc
diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc
index 7aee612a35ad72ee5271200f3c612c85aaacaa22..86ca3f13d32bbd1989c0f37a808eb8a0550c78e2 100644
--- a/chrome/browser/importer/firefox3_importer.cc
+++ b/chrome/browser/importer/firefox3_importer.cc
@@ -14,7 +14,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/history/history_types.h"
-#include "chrome/browser/importer/firefox2_importer.h"
+#include "chrome/browser/importer/bookmarks_file_importer.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_util.h"
@@ -59,6 +59,21 @@ TemplateURL* CreateTemplateURL(const string16& title,
   return new TemplateURL(NULL, data);
 }
 
+// Loads the default bookmarks in the Firefox installed at |app_path|,
+// and stores their locations in |urls|.
+void LoadDefaultBookmarks(const base::FilePath& app_path,
+                          std::set<GURL>* urls) {
+  base::FilePath file = app_path.AppendASCII("defaults")
+      .AppendASCII("profile")
+      .AppendASCII("bookmarks.html");
+  urls->clear();
+
+  std::vector<ProfileWriter::BookmarkEntry> bookmarks;
+  BookmarksFileImporter::ImportBookmarksFile(file, NULL, &bookmarks, NULL);
+  for (size_t i = 0; i < bookmarks.size(); ++i)
+    urls->insert(bookmarks[i].url);
+}
+
 }  // namespace
 
 struct Firefox3Importer::BookmarkItem {
@@ -189,9 +204,9 @@ void Firefox3Importer::ImportBookmarks() {
   std::set<int> livemark_id;
   LoadLivemarkIDs(&db, &livemark_id);
 
-  // Load the default bookmarks. Its storage is the same as Firefox 2.
+  // Load the default bookmarks.
   std::set<GURL> default_urls;
-  Firefox2Importer::LoadDefaultBookmarks(app_path_, &default_urls);
+  LoadDefaultBookmarks(app_path_, &default_urls);
 
   BookmarkList list;
   GetTopBookmarkFolder(&db, toolbar_folder_id, &list);