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

chrome/browser/importer/external_process_importer_client.h

Index: chrome/browser/importer/external_process_importer_client.h
===================================================================
--- chrome/browser/importer/external_process_importer_client.h	(revision 208750)
+++ chrome/browser/importer/external_process_importer_client.h	(working copy)
@@ -10,6 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/files/file_path.h"

[gab, 2013/06/27 22:07:29]

Why add this include?

[ananta, 2013/06/27 22:29:55]

Artifact from a previous patch iteration. Gone

 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/history/history_types.h"
@@ -65,10 +66,11 @@
   void OnFaviconsImportGroup(
       const std::vector<ImportedFaviconUsage>& favicons_group);
   void OnPasswordFormImportReady(const content::PasswordForm& form);
-  // WARNING: This function takes ownership of (and deletes) the pointers in
-  // |template_urls|!
-  void OnKeywordsImportReady(const std::vector<TemplateURL*>& template_urls,
-                             bool unique_on_host_and_path);
+  void OnKeywordsImportReady(
+      const std::vector<importer::URLKeywordInfo>& url_keywords,

[gab, 2013/06/27 22:07:29]

Fwd-decl URLKeywordInfo.

[ananta, 2013/06/27 22:29:55]

Done.

+      bool unique_on_host_and_path);
+  void OnFirefoxSearchEngineDataReceived(
+      const std::vector<std::string> search_engine_data);
 
  protected:
   virtual ~ExternalProcessImporterClient();