Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/external_process_importer_client.cc

 // 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.
 
 #include "chrome/browser/importer/external_process_importer_client.h"
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
+#include "chrome/browser/bookmarks/imported_bookmark_entry.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/in_process_importer_bridge.h"
 #include "chrome/browser/importer/profile_import_process_messages.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/utility_process_host.h"
@@ skipping 160 matching lines @@
     size_t total_bookmarks_count) {
   if (cancelled_)
     return;
 
   bookmarks_first_folder_name_ = first_folder_name;
   total_bookmarks_count_ = total_bookmarks_count;
   bookmarks_.reserve(total_bookmarks_count);
 }
 
 void ExternalProcessImporterClient::OnBookmarksImportGroup(
-    const std::vector<ProfileWriter::BookmarkEntry>& bookmarks_group) {
+    const std::vector<ImportedBookmarkEntry>& bookmarks_group) {
   if (cancelled_)
     return;
 
   // Collect sets of bookmarks from importer process until we have reached
   // total_bookmarks_count_:
   bookmarks_.insert(bookmarks_.end(), bookmarks_group.begin(),
                     bookmarks_group.end());
   if (bookmarks_.size() == total_bookmarks_count_)
     bridge_->AddBookmarks(bookmarks_, bookmarks_first_folder_name_);
 }
 
 void ExternalProcessImporterClient::OnFaviconsImportStart(
     size_t total_favicons_count) {
   if (cancelled_)
     return;
 
   total_favicons_count_ = total_favicons_count;
   favicons_.reserve(total_favicons_count);
 }
 
 void ExternalProcessImporterClient::OnFaviconsImportGroup(
-    const std::vector<history::ImportedFaviconUsage>& favicons_group) {
+    const std::vector<ImportedFaviconUsage>& favicons_group) {
   if (cancelled_)
     return;
 
   favicons_.insert(favicons_.end(), favicons_group.begin(),
                     favicons_group.end());
   if (favicons_.size() == total_favicons_count_)
     bridge_->SetFavicons(favicons_);
 }
 
 void ExternalProcessImporterClient::OnPasswordFormImportReady(
@@ skipping 70 matching lines @@
   localized_strings.SetString(
       base::IntToString(IDS_IMPORT_FROM_SAFARI),
       l10n_util::GetStringUTF8(IDS_IMPORT_FROM_SAFARI));
   localized_strings.SetString(
       base::IntToString(IDS_BOOKMARK_BAR_FOLDER_NAME),
       l10n_util::GetStringUTF8(IDS_BOOKMARK_BAR_FOLDER_NAME));
 
   utility_process_host_->Send(new ProfileImportProcessMsg_StartImport(
       source_profile_, items_, localized_strings));
 }