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

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"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 using content::UtilityProcessHost;
 
 ExternalProcessImporterClient::ExternalProcessImporterClient(
     ExternalProcessImporterHost* importer_host,
@@ skipping 68 matching lines @@
     IPC_MESSAGE_HANDLER(ProfileImportProcessHostMsg_NotifyBookmarksImportGroup,
                         OnBookmarksImportGroup)
     IPC_MESSAGE_HANDLER(ProfileImportProcessHostMsg_NotifyFaviconsImportStart,
                         OnFaviconsImportStart)
     IPC_MESSAGE_HANDLER(ProfileImportProcessHostMsg_NotifyFaviconsImportGroup,
                         OnFaviconsImportGroup)
     IPC_MESSAGE_HANDLER(ProfileImportProcessHostMsg_NotifyPasswordFormReady,
                         OnPasswordFormImportReady)
     IPC_MESSAGE_HANDLER(ProfileImportProcessHostMsg_NotifyKeywordsReady,
                         OnKeywordsImportReady)
+    IPC_MESSAGE_HANDLER(
+        ProfileImportProcessHostMsg_NotifyFirefoxSearchEngineData,
+        OnFirefoxSearchEngineDataReceived)

[scottmg, 2013/06/27 15:47:21]

nit; make indent match other messages

[ananta, 2013/06/27 15:56:49]

Changed the IPC name to ProfileImportProcessHostMsg_NotifyFirefoxSearchEngData
to get this to
fit within 80 columns

     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void ExternalProcessImporterClient::OnImportStart() {
   if (cancelled_)
     return;
 
   bridge_->NotifyStarted();
@@ skipping 106 matching lines @@
 
 void ExternalProcessImporterClient::OnPasswordFormImportReady(
     const content::PasswordForm& form) {
   if (cancelled_)
     return;
 
   bridge_->SetPasswordForm(form);
 }
 
 void ExternalProcessImporterClient::OnKeywordsImportReady(
-    const std::vector<TemplateURL*>& template_urls,
+    const std::vector<importer::URLKeywordInfo>& url_keywords,
     bool unique_on_host_and_path) {
   if (cancelled_)
     return;
+  bridge_->SetKeywords(url_keywords, unique_on_host_and_path);
+}
 
-  bridge_->SetKeywords(template_urls, unique_on_host_and_path);
-  // The pointers in |template_urls| have now been deleted.
+void ExternalProcessImporterClient::OnFirefoxSearchEngineDataReceived(
+    const std::vector<std::string> search_engine_data) {
+  if (cancelled_)
+    return;
+  bridge_->SetFirefoxSearchEnginesXMLData(search_engine_data);
 }
 
 ExternalProcessImporterClient::~ExternalProcessImporterClient() {}
 
 void ExternalProcessImporterClient::Cleanup() {
   if (cancelled_)
     return;
 
   if (process_importer_host_)
     process_importer_host_->NotifyImportEnded();
@@ skipping 44 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));
 }