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

 // 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_CLIENT_H_
 #define CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_CLIENT_H_
 
 #include <string>
 #include <vector>
 
 #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"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/utility_process_host_client.h"
 
 class ExternalProcessImporterHost;
 struct ImportedBookmarkEntry;
 struct ImportedFaviconUsage;
 class InProcessImporterBridge;
 class TemplateURL;

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

Remove fwd-decl

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

Done.

 
 namespace content {
 struct PasswordForm;
 class UtilityProcessHost;
 }
 
 // This class is the client for the out of process profile importing.  It
 // collects notifications from this process host and feeds data back to the
 // importer host, who actually does the writing.
 class ExternalProcessImporterClient : public content::UtilityProcessHostClient {
@@ skipping 23 matching lines @@
                             int visit_source);
   void OnHomePageImportReady(const GURL& home_page);
   void OnBookmarksImportStart(const string16& first_folder_name,
                               size_t total_bookmarks_count);
   void OnBookmarksImportGroup(
       const std::vector<ImportedBookmarkEntry>& bookmarks_group);
   void OnFaviconsImportStart(size_t total_favicons_count);
   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();
 
  private:
   // Notifies the importerhost that import has finished, and calls Release().
   void Cleanup();
 
   // Cancel import process on IO thread.
   void CancelImportProcessOnIOThread();
@@ skipping 42 matching lines @@
   // ProfileWriter.
   scoped_refptr<InProcessImporterBridge> bridge_;
 
   // True if import process has been cancelled.
   bool cancelled_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalProcessImporterClient);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_CLIENT_H_