Move most importer code to chrome/utility/importer

chrome/utility/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 "chrome/utility/importer/external_process_importer_bridge.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_runner.h"
 #include "base/values.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
 #include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/importer/importer_data_types.h"
 #include "chrome/common/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;
 
 }
@@ skipping 64 matching lines @@
     Send(new ProfileImportProcessHostMsg_NotifyFaviconsImportGroup(
         favicons_group));
     favicons_left -= end_group - it;
     it = end_group;
   }
   DCHECK_EQ(0, favicons_left);
 }
 
 void ExternalProcessImporterBridge::SetHistoryItems(
     const std::vector<ImporterURLRow>& rows,
-    history::VisitSource visit_source) {
+    ImporterVisitSource visit_source) {
   Send(new ProfileImportProcessHostMsg_NotifyHistoryImportStart(rows.size()));
 
   // |rows_left| is required for the checks below as Windows has a
   // Debug bounds-check which prevents pushing an iterator beyond its end()
   // (i.e., |it + 2 < s.end()| crashes in debug mode if |i + 1 == s.end()|).
   int rows_left = rows.end() - rows.begin();
   for (std::vector<ImporterURLRow>::const_iterator it = rows.begin();
        it < rows.end();) {
     std::vector<ImporterURLRow> row_group;
     std::vector<ImporterURLRow>::const_iterator end_group =
@@ skipping 55 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);
 }