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

chrome/browser/importer/importer_bridge.h

Index: chrome/browser/importer/importer_bridge.h
===================================================================
--- chrome/browser/importer/importer_bridge.h	(revision 208948)
+++ chrome/browser/importer/importer_bridge.h	(working copy)
@@ -5,9 +5,11 @@
 #ifndef CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_
 #define CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_
 
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/files/file_path.h"

[gab, 2013/06/27 23:12:44]

Remove this import.

[ananta, 2013/06/27 23:26:09]

Done.

 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
@@ -18,7 +20,11 @@
 struct IE7PasswordInfo;
 struct ImportedBookmarkEntry;
 struct ImportedFaviconUsage;
-class TemplateURL;
+
+namespace importer {
+struct URLKeywordInfo;
+}
+
 // TODO: remove this, see friend declaration in ImporterBridge.
 class Toolbar5Importer;
 
@@ -46,11 +52,15 @@
   virtual void SetHistoryItems(const history::URLRows& rows,
                                history::VisitSource visit_source) = 0;
 
-  // WARNING: This function takes ownership of (and deletes) the pointers in
-  // |template_urls|!
-  virtual void SetKeywords(const std::vector<TemplateURL*>& template_urls,
-                           bool unique_on_host_and_path) = 0;
+  virtual void SetKeywords(
+      const std::vector<importer::URLKeywordInfo>& url_keywords,
+      bool unique_on_host_and_path) = 0;
 
+  // The search_engine_data vector contains XML data retrieved from the Firefox
+  // profile and its sqlite db.
+  virtual void SetFirefoxSearchEnginesXMLData(
+      const std::vector<std::string>& search_engine_data) = 0;
+
   virtual void SetPasswordForm(const content::PasswordForm& form) = 0;
 
   // Notifies the coordinator that the import operation has begun.