Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/safari_importer.h

 // 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.
 
 #ifndef CHROME_BROWSER_IMPORTER_SAFARI_IMPORTER_H_
 #define CHROME_BROWSER_IMPORTER_SAFARI_IMPORTER_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
+#include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/importer.h"
-#include "chrome/browser/importer/profile_writer.h"
 
 #if __OBJC__
 @class NSDictionary;
 @class NSString;
 #else
 class NSDictionary;
 class NSString;
 #endif
 
 class GURL;
+struct ImportedBookmarkEntry;
+struct ImportedFaviconUsage;
 
 namespace history {
 class URLRow;
-struct ImportedFaviconUsage;
 }
 
 namespace sql {
 class Connection;
 }
 
 // Importer for Safari on OS X.
 class SafariImporter : public Importer {
  public:
   // |library_dir| is the full path to the ~/Library directory,
@@ skipping 24 matching lines @@
   // of URLs -> IconIDs that we load as a temporary step before
   // actually loading the icons.
   typedef std::map<int64, std::set<GURL> > FaviconMap;
 
   void ImportBookmarks();
   void ImportPasswords();
   void ImportHistory();
 
   // Parse Safari's stored bookmarks.
   void ParseBookmarks(const string16& toolbar_name,
-                      std::vector<ProfileWriter::BookmarkEntry>* bookmarks);
+                      std::vector<ImportedBookmarkEntry>* bookmarks);
 
   // Function to recursively read Bookmarks out of Safari plist.
   // |bookmark_folder| The dictionary containing a folder to parse.
   // |parent_path_elements| Path elements up to this point.
   // |is_in_toolbar| Is this folder in the toolbar.
   // |out_bookmarks| BookMark element array to write into.
   void RecursiveReadBookmarksFolder(
       NSDictionary* bookmark_folder,
       const std::vector<string16>& parent_path_elements,
       bool is_in_toolbar,
       const string16& toolbar_name,
-      std::vector<ProfileWriter::BookmarkEntry>* out_bookmarks);
+      std::vector<ImportedBookmarkEntry>* out_bookmarks);
 
   // Converts history time stored by Safari as a double serialized as a string,
   // to seconds-since-UNIX-Ephoch-format used by Chrome.
   double HistoryTimeToEpochTime(NSString* history_time);
 
   // Parses Safari's history and loads it into the input array.
   void ParseHistoryItems(history::URLRows* history_items);
 
   // Opens the favicon database file.
   bool OpenDatabase(sql::Connection* db);
 
   // Loads the urls associated with the favicons into favicon_map;
   void ImportFaviconURLs(sql::Connection* db, FaviconMap* favicon_map);
 
   // Loads and reencodes the individual favicons.
   void LoadFaviconData(sql::Connection* db,
                        const FaviconMap& favicon_map,
-                       std::vector<history::ImportedFaviconUsage>* favicons);
+                       std::vector<ImportedFaviconUsage>* favicons);
 
   base::FilePath library_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(SafariImporter);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_SAFARI_IMPORTER_H_