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

chrome/browser/importer/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_IMPORTER_BRIDGE_H_
 #define CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_
 
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/importer_data_types.h"
 
 class GURL;
 struct IE7PasswordInfo;
 struct ImportedBookmarkEntry;
 struct ImportedFaviconUsage;
 class TemplateURL;

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

Remove fwd-decl.

 // TODO: remove this, see friend declaration in ImporterBridge.
 class Toolbar5Importer;
 
 namespace content {
 struct PasswordForm;
 }
 
 class ImporterBridge : public base::RefCountedThreadSafe<ImporterBridge> {
  public:
   ImporterBridge();
 
   virtual void AddBookmarks(
       const std::vector<ImportedBookmarkEntry>& bookmarks,
       const string16& first_folder_name) = 0;
 
   virtual void AddHomePage(const GURL& home_page) = 0;
 
 #if defined(OS_WIN)
   virtual void AddIE7PasswordInfo(const IE7PasswordInfo& password_info) = 0;
 #endif
 
   virtual void SetFavicons(
       const std::vector<ImportedFaviconUsage>& favicons) = 0;
 
   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,

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

Fwd-decl URLKeywordInfo

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

Done.

+      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(

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

I would rather not add a Firefox only method to this interface. As mentioned in
a previous comment I think it is better to move ParseSearchEnginesFromXMLFiles()
on the utility side of the split and keep sending data via SetKeywords() for
this import mechanism.

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

Please look at the comments for the ParseSearchEnginesFromXMLFiles function as
to why this is needed.

+      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.
   virtual void NotifyStarted() = 0;
 
   // Notifies the coordinator that the collection of data for the specified
   // item has begun.
   virtual void NotifyItemStarted(importer::ImportItem item) = 0;
 
@@ skipping 16 matching lines @@
   // connection, but as an interim step we allow Toolbar5Import to break
   // the abstraction here and assume import is in-process.
   friend class Toolbar5Importer;
 
   virtual ~ImporterBridge();
 
   DISALLOW_COPY_AND_ASSIGN(ImporterBridge);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_