The browser importer code which runs in the utility process should not depend on chrome\browser dat…

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/strings/utf_string_conversions.h"
 #include "base/task_runner.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/imported_bookmark_entry.h"
 #include "chrome/browser/favicon/imported_favicon_usage.h"
+#include "chrome/browser/importer/importer_data_types.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 {
 
@@ skipping 94 matching lines @@
 
     Send(new ProfileImportProcessHostMsg_NotifyHistoryImportGroup(
         row_group, visit_source));
     rows_left -= end_group - it;
     it = end_group;
   }
   DCHECK_EQ(0, rows_left);
 }
 
 void ExternalProcessImporterBridge::SetKeywords(
-    const std::vector<TemplateURL*>& template_urls,
+    const std::vector<importer::URLKeywordInfo>& url_keywords,
     bool unique_on_host_and_path) {
-  Send(new ProfileImportProcessHostMsg_NotifyKeywordsReady(template_urls,
-      unique_on_host_and_path));
-  STLDeleteContainerPointers(template_urls.begin(), template_urls.end());
+  Send(new ProfileImportProcessHostMsg_NotifyKeywordsReady(
+      url_keywords, unique_on_host_and_path));
+}
+
+void ExternalProcessImporterBridge::SetFirefoxSearchEnginesXMLData(
+    const std::vector<std::string>& search_engine_data) {
+  Send(new ProfileImportProcessHostMsg_NotifyFirefoxSearchEngData(
+      search_engine_data));
 }
 
 void ExternalProcessImporterBridge::SetPasswordForm(
     const content::PasswordForm& form) {
   Send(new ProfileImportProcessHostMsg_NotifyPasswordFormReady(form));
 }
 
 void ExternalProcessImporterBridge::NotifyStarted() {
   Send(new ProfileImportProcessHostMsg_Import_Started());
 }
@@ skipping 23 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);
 }