Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/toolbar_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.
 
 // The functionality provided here allows the user to import their bookmarks
 // (favorites) from Google Toolbar.
 
 #ifndef CHROME_BROWSER_IMPORTER_TOOLBAR_IMPORTER_H_
 #define CHROME_BROWSER_IMPORTER_TOOLBAR_IMPORTER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "chrome/browser/importer/importer.h"
-#include "chrome/browser/importer/profile_writer.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 
+struct ImportedBookmarkEntry;
 class ImporterBridge;
 class XmlReader;
 
 namespace net {
 class URLFetcher;
 }  // namespace net
 
 // Toolbar5Importer is a class which exposes the functionality needed to
 // communicate with the Google Toolbar v5 front-end, negotiate the download of
 // Toolbar bookmarks, parse them, and install them on the client.
@@ skipping 77 matching lines @@
   void GetAuthenticationFromServer();
   void GetBookmarkDataFromServer(const std::string& response);
   void GetBookmarksFromServerDataResponse(const std::string& response);
 
   // XML Parsing is implemented with the methods below.
   bool ParseAuthenticationTokenResponse(const std::string& response,
                                         std::string* token);
 
   static bool ParseBookmarksFromReader(
       XmlReader* reader,
-      std::vector<ProfileWriter::BookmarkEntry>* bookmarks,
+      std::vector<ImportedBookmarkEntry>* bookmarks,
       const string16& bookmark_group_string);
 
   static bool LocateNextOpenTag(XmlReader* reader);
   static bool LocateNextTagByName(XmlReader* reader, const std::string& tag);
   static bool LocateNextTagWithStopByName(
       XmlReader* reader,
       const std::string& tag,
       const std::string& stop);
 
   static bool ExtractBookmarkInformation(
       XmlReader* reader,
-      ProfileWriter::BookmarkEntry* bookmark_entry,
+      ImportedBookmarkEntry* bookmark_entry,
       std::vector<BookmarkFolderType>* bookmark_folders,
       const string16& bookmark_group_string);
   static bool ExtractNamedValueFromXmlReader(XmlReader* reader,
                                              const std::string& name,
                                              std::string* buffer);
   static bool ExtractTitleFromXmlReader(XmlReader* reader,
-                                        ProfileWriter::BookmarkEntry* entry);
+                                        ImportedBookmarkEntry* entry);
   static bool ExtractUrlFromXmlReader(XmlReader* reader,
-                                      ProfileWriter::BookmarkEntry* entry);
+                                      ImportedBookmarkEntry* entry);
   static bool ExtractTimeFromXmlReader(XmlReader* reader,
-                                       ProfileWriter::BookmarkEntry* entry);
+                                       ImportedBookmarkEntry* entry);
   static bool ExtractFoldersFromXmlReader(
       XmlReader* reader,
       std::vector<BookmarkFolderType>* bookmark_folders,
       const string16& bookmark_group_string);
 
   // Bookmark creation is done by the method below.
   void AddBookmarksToChrome(
-      const std::vector<ProfileWriter::BookmarkEntry>& bookmarks);
+      const std::vector<ImportedBookmarkEntry>& bookmarks);
 
   InternalStateEnum state_;
 
   // Bitmask of Importer::ImportItem.
   uint16 items_to_import_;
 
   // The fetchers need to be available to cancel the network call on user cancel
   // hence they are stored as member variables.
   net::URLFetcher* token_fetcher_;
   net::URLFetcher* data_fetcher_;
 
   // Used to get correct login data for the toolbar server.
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
 
   DISALLOW_COPY_AND_ASSIGN(Toolbar5Importer);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_TOOLBAR_IMPORTER_H_