Improve Firefox importer to handle all Firefox profiles.

chrome/utility/importer/firefox_importer.h

Index: chrome/utility/importer/firefox_importer.h
diff --git a/chrome/utility/importer/firefox_importer.h b/chrome/utility/importer/firefox_importer.h
index 28bf603c89fe983d30e920775c4be6c44b8f0486..7e80ee74bd442c158e1cc88f3a3b8db5e84361bb 100644
--- a/chrome/utility/importer/firefox_importer.h
+++ b/chrome/utility/importer/firefox_importer.h
@@ -15,6 +15,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
+#include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/utility/importer/importer.h"
@@ -32,6 +33,7 @@ class Connection;
 class FirefoxImporter : public Importer {
  public:
   FirefoxImporter();
+  ~FirefoxImporter() override;
 
   // Importer:
   void StartImport(const importer::SourceProfile& source_profile,
@@ -39,10 +41,7 @@ class FirefoxImporter : public Importer {
                    ImporterBridge* bridge) override;
 
  private:
-  typedef std::map<int64_t, std::set<GURL>> FaviconMap;
-
-  ~FirefoxImporter() override;
-
+  FRIEND_TEST_ALL_PREFIXES(FirefoxImporterTest, ImportBookmarksV25);
   void ImportBookmarks();
   void ImportPasswords();
   void ImportHistory();
@@ -55,33 +54,6 @@ class FirefoxImporter : public Importer {
   void GetSearchEnginesXMLDataFromJSON(
       std::vector<std::string>* search_engine_data);
 
-  // The struct stores the information about a bookmark item.
-  struct BookmarkItem;
-  typedef std::vector<BookmarkItem*> BookmarkList;
-
-  // Gets the specific IDs of bookmark root node from |db|.
-  void LoadRootNodeID(sql::Connection* db, int* toolbar_folder_id,
-                      int* menu_folder_id, int* unsorted_folder_id);
-
-  // Loads all livemark IDs from database |db|.
-  void LoadLivemarkIDs(sql::Connection* db, std::set<int>* livemark);
-
-  // Gets the bookmark folder with given ID, and adds the entry in |list|
-  // if successful.
-  void GetTopBookmarkFolder(sql::Connection* db,
-                            int folder_id,
-                            BookmarkList* list);
-
-  // Loads all children of the given folder, and appends them to the |list|.
-  void GetWholeBookmarkFolder(sql::Connection* db, BookmarkList* list,
-                              size_t position, bool* empty_folder);
-
-  // Loads the favicons given in the map from the database, loads the data,
-  // and converts it into FaviconUsage structures.
-  void LoadFavicons(sql::Connection* db,
-                    const FaviconMap& favicon_map,
-                    favicon_base::FaviconUsageDataList* favicons);
-
   base::FilePath source_path_;
   base::FilePath app_path_;