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

chrome/browser/importer/external_process_importer_bridge.h

 // 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.
 
 #ifndef CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_
 #define CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_
 
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/importer/importer_bridge.h"
 
 class GURL;
 struct ImportedBookmarkEntry;
 
@@ skipping 30 matching lines @@
   virtual void AddIE7PasswordInfo(
       const IE7PasswordInfo& password_info) OVERRIDE;
 #endif
 
   virtual void SetFavicons(
       const std::vector<ImportedFaviconUsage>& favicons) OVERRIDE;
 
   virtual void SetHistoryItems(const history::URLRows& rows,
                                history::VisitSource visit_source) OVERRIDE;
 
-  virtual void SetKeywords(const std::vector<TemplateURL*>& template_urls,
-                           bool unique_on_host_and_path) OVERRIDE;
+  virtual void SetKeywords(
+      const std::vector<importer::URLKeywordInfo>& url_keywords,

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

Forward-declare URLKeywordInfo

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

Done.

+      bool unique_on_host_and_path) OVERRIDE;
+
+  virtual void SetFirefoxSearchEnginesXMLData(
+      const std::vector<std::string>& seach_engine_data) OVERRIDE;
 
   virtual void SetPasswordForm(
       const content::PasswordForm& form) OVERRIDE;
 
   virtual void NotifyStarted() OVERRIDE;
   virtual void NotifyItemStarted(importer::ImportItem item) OVERRIDE;
   virtual void NotifyItemEnded(importer::ImportItem item) OVERRIDE;
   virtual void NotifyEnded() OVERRIDE;
 
   virtual string16 GetLocalizedString(int message_id) OVERRIDE;
   // End ImporterBridge implementation.
 
  private:
   virtual ~ExternalProcessImporterBridge();
 
   void Send(IPC::Message* message);
   void SendInternal(IPC::Message* message);
 
   // Holds strings needed by the external importer because the resource
   // bundle isn't available to the external process.
   scoped_ptr<base::DictionaryValue> localized_strings_;
 
   IPC::Sender* sender_;
   scoped_refptr<base::TaskRunner> task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalProcessImporterBridge);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_