Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/firefox2_importer.h

 // 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.
 
 #ifndef CHROME_BROWSER_IMPORTER_FIREFOX2_IMPORTER_H_
 #define CHROME_BROWSER_IMPORTER_FIREFOX2_IMPORTER_H_
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "chrome/browser/importer/importer.h"
-#include "chrome/browser/importer/profile_writer.h"
 
 class GURL;
+struct ImportedBookmarkEntry;
+struct ImportedFaviconUsage;
 class TemplateURL;
 
+namespace base {
+class Time;
+}
+
 // Importer for Mozilla Firefox 2.
 class Firefox2Importer : public Importer {
  public:
   Firefox2Importer();
 
   // Importer:
   virtual void StartImport(const importer::SourceProfile& source_profile,
                            uint16 items,
                            ImporterBridge* bridge) OVERRIDE;
 
   // Loads the default bookmarks in the Firefox installed at |firefox_app_path|,
   // and stores their locations in |urls|.
   static void LoadDefaultBookmarks(const base::FilePath& firefox_app_path,
                                    std::set<GURL>* urls);
 
   // Creates a TemplateURL with the |keyword| and |url|. |title| may be empty.
   // This function transfers ownership of the created TemplateURL to the caller.
   static TemplateURL* CreateTemplateURL(const string16& title,
                                         const string16& keyword,
                                         const GURL& url);
 
   // Imports the bookmarks from the specified file. |template_urls| and
   // |favicons| may be null, in which case TemplateURLs and favicons are
   // not parsed. Any bookmarks in |default_urls| are ignored.
   static void ImportBookmarksFile(
       const base::FilePath& file_path,
       const std::set<GURL>& default_urls,
       Importer* importer,
-      std::vector<ProfileWriter::BookmarkEntry>* bookmarks,
+      std::vector<ImportedBookmarkEntry>* bookmarks,
       std::vector<TemplateURL*>* template_urls,
-      std::vector<history::ImportedFaviconUsage>* favicons);
+      std::vector<ImportedFaviconUsage>* favicons);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(FirefoxImporterTest, Firefox2BookmarkParse);
   FRIEND_TEST_ALL_PREFIXES(FirefoxImporterTest, Firefox2CookesParse);
   FRIEND_TEST_ALL_PREFIXES(FirefoxImporterTest, Firefox2BookmarkFileImport);
 
   virtual ~Firefox2Importer();
 
   void ImportBookmarks();
   void ImportPasswords();
@@ skipping 64 matching lines @@
   // Fills |xml_files| with the file with an xml extension found under |dir|.
   static void FindXMLFilesInDir(const base::FilePath& dir,
                                 std::vector<base::FilePath>* xml_files);
 
   // Given the URL of a page and a favicon data URL, adds an appropriate record
   // to the given favicon usage vector. Will do nothing if the favicon is not
   // valid.
   static void DataURLToFaviconUsage(
       const GURL& link_url,
       const GURL& favicon_data,
-      std::vector<history::ImportedFaviconUsage>* favicons);
+      std::vector<ImportedFaviconUsage>* favicons);
 
   base::FilePath source_path_;
   base::FilePath app_path_;
   // If true, we only parse the bookmarks.html file specified as source_path_.
   bool parsing_bookmarks_html_file_;
 
   DISALLOW_COPY_AND_ASSIGN(Firefox2Importer);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_FIREFOX2_IMPORTER_H_