Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/external_process_importer_bridge.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_bridge.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/history/history_types.h"
+#include "chrome/browser/bookmarks/imported_bookmark_entry.h"
+#include "chrome/browser/favicon/imported_favicon_usage.h"
 #include "chrome/browser/importer/profile_import_process_messages.h"
 #include "content/public/common/password_form.h"
 #include "ipc/ipc_sender.h"
 
 #if defined(OS_WIN)
 #include "components/webdata/encryptor/ie7_password.h"
 #endif
 
 namespace {
 // Rather than sending all import items over IPC at once we chunk them into
 // separate requests.  This avoids the case of a large import causing
 // oversized IPC messages.
 const int kNumBookmarksToSend = 100;
 const int kNumHistoryRowsToSend = 100;
 const int kNumFaviconsToSend = 100;
 }
 
 ExternalProcessImporterBridge::ExternalProcessImporterBridge(
     const DictionaryValue& localized_strings,
     IPC::Sender* sender,
     base::TaskRunner* task_runner)
     : sender_(sender),
       task_runner_(task_runner) {
   // Bridge needs to make its own copy because OS 10.6 autoreleases the
   // localized_strings value that is passed in (see http://crbug.com/46003 ).
   localized_strings_.reset(localized_strings.DeepCopy());
 }
 
 void ExternalProcessImporterBridge::AddBookmarks(
-    const std::vector<ProfileWriter::BookmarkEntry>& bookmarks,
+    const std::vector<ImportedBookmarkEntry>& bookmarks,
     const string16& first_folder_name) {
   Send(new ProfileImportProcessHostMsg_NotifyBookmarksImportStart(
       first_folder_name, bookmarks.size()));
 
-  std::vector<ProfileWriter::BookmarkEntry>::const_iterator it;
+  std::vector<ImportedBookmarkEntry>::const_iterator it;
   for (it = bookmarks.begin(); it < bookmarks.end();
        it = it + kNumBookmarksToSend) {
-    std::vector<ProfileWriter::BookmarkEntry> bookmark_group;
-    std::vector<ProfileWriter::BookmarkEntry>::const_iterator end_group =
+    std::vector<ImportedBookmarkEntry> bookmark_group;
+    std::vector<ImportedBookmarkEntry>::const_iterator end_group =
         it + kNumBookmarksToSend < bookmarks.end() ?
         it + kNumBookmarksToSend : bookmarks.end();
     bookmark_group.assign(it, end_group);
 
     Send(new ProfileImportProcessHostMsg_NotifyBookmarksImportGroup(
         bookmark_group));
   }
 }
 
 void ExternalProcessImporterBridge::AddHomePage(const GURL& home_page) {
   NOTIMPLEMENTED();
 }
 
 #if defined(OS_WIN)
 void ExternalProcessImporterBridge::AddIE7PasswordInfo(
     const IE7PasswordInfo& password_info) {
   NOTIMPLEMENTED();
 }
 #endif
 
 void ExternalProcessImporterBridge::SetFavicons(
-    const std::vector<history::ImportedFaviconUsage>& favicons) {
+    const std::vector<ImportedFaviconUsage>& favicons) {
   Send(new ProfileImportProcessHostMsg_NotifyFaviconsImportStart(
     favicons.size()));
 
-  std::vector<history::ImportedFaviconUsage>::const_iterator it;
+  std::vector<ImportedFaviconUsage>::const_iterator it;
   for (it = favicons.begin(); it < favicons.end();
        it = it + kNumFaviconsToSend) {
-    std::vector<history::ImportedFaviconUsage> favicons_group;
-    std::vector<history::ImportedFaviconUsage>::const_iterator end_group =
+    std::vector<ImportedFaviconUsage> favicons_group;
+    std::vector<ImportedFaviconUsage>::const_iterator end_group =
         std::min(it + kNumFaviconsToSend, favicons.end());
     favicons_group.assign(it, end_group);
 
   Send(new ProfileImportProcessHostMsg_NotifyFaviconsImportGroup(
       favicons_group));
   }
 }
 
 void ExternalProcessImporterBridge::SetHistoryItems(
     const history::URLRows& rows,
@@ skipping 56 matching lines @@
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&ExternalProcessImporterBridge::SendInternal,
                  this, message));
 }
 
 void ExternalProcessImporterBridge::SendInternal(IPC::Message* message) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   sender_->Send(message);
 }