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

chrome/browser/importer/firefox3_importer.cc

 // Copyright (c) 2012 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 "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #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"
 #include "chrome/browser/importer/nss_decryptor.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/time_format.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/password_form.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
@@ skipping 24 matching lines @@
 
   TemplateURLData data;
   // We set short name by using the title if it exists.
   // Otherwise, we use the shortcut.
   data.short_name = title.empty() ? keyword : title;
   data.SetKeyword(keyword);
   data.SetURL(TemplateURLRef::DisplayURLToURLRef(UTF8ToUTF16(url.spec())));
   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 {
   int parent;
   int id;
   GURL url;
   string16 title;
   BookmarkItemType type;
   std::string keyword;
   base::Time date_added;
@@ skipping 110 matching lines @@
   // Get the bookmark folders that we are interested in.
   int toolbar_folder_id = -1;
   int menu_folder_id = -1;
   int unsorted_folder_id = -1;
   LoadRootNodeID(&db, &toolbar_folder_id, &menu_folder_id, &unsorted_folder_id);
 
   // Load livemark IDs.
   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);
   GetTopBookmarkFolder(&db, menu_folder_id, &list);
   GetTopBookmarkFolder(&db, unsorted_folder_id, &list);
   size_t count = list.size();
   for (size_t i = 0; i < count; ++i)
     GetWholeBookmarkFolder(&db, &list, i, NULL);
 
   std::vector<ProfileWriter::BookmarkEntry> bookmarks;
@@ skipping 375 matching lines @@
 
       if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data))
         continue;  // Unable to decode.
 
       usage.urls = i->second;
       favicons->push_back(usage);
     }
     s.Reset(true);
   }
 }