Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/ie_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_IE_IMPORTER_H_
 #define CHROME_BROWSER_IMPORTER_IE_IMPORTER_H_
 
 #include <vector>
 
 #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/ie_importer_test_registry_overrider_win.h"
 #include "chrome/browser/importer/importer.h"
-#include "chrome/browser/importer/profile_writer.h"
+
+struct ImportedBookmarkEntry;
+struct ImportedFaviconUsage;
 
 class IEImporter : public Importer {
  public:
   IEImporter();
 
   // Importer:
   virtual void StartImport(const importer::SourceProfile& source_profile,
                            uint16 items,
                            ImporterBridge* bridge) OVERRIDE;
 
  private:
-  typedef std::vector<ProfileWriter::BookmarkEntry> BookmarkVector;
+  typedef std::vector<ImportedBookmarkEntry> BookmarkVector;
 
   // A struct that hosts the information of IE Favorite folder.
   struct FavoritesInfo {
     base::FilePath path;
     string16 links_folder;
   };
 
   // IE PStore subkey GUID: AutoComplete password & form data.
   static const GUID kPStoreAutocompleteGUID;
 
@@ skipping 24 matching lines @@
   void ImportHomepage();
 
   // Gets the information of Favorites folder. Returns true if successful.
   bool GetFavoritesInfo(FavoritesInfo* info);
 
   // This function will read the files in the Favorites folder, and store
   // the bookmark items in |bookmarks| and favicon information in |favicons|.
   void ParseFavoritesFolder(
       const FavoritesInfo& info,
       BookmarkVector* bookmarks,
-      std::vector<history::ImportedFaviconUsage>* favicons);
+      std::vector<ImportedFaviconUsage>* favicons);
 
   // Determines which version of IE is in use.
   int CurrentIEVersion() const;
 
   // IE does not have source path. It's used in unit tests only for providing a
   // fake source.
   base::FilePath source_path_;
 
   // Used to override the registry for IEImporterTests if needed.
   IEImporterTestRegistryOverrider test_registry_overrider_;
 
   DISALLOW_COPY_AND_ASSIGN(IEImporter);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_IE_IMPORTER_H_