Disable uses of ProfileImportProcess on Android.

chrome/utility/chrome_content_utility_client.h

Index: chrome/utility/chrome_content_utility_client.h
diff --git a/chrome/utility/chrome_content_utility_client.h b/chrome/utility/chrome_content_utility_client.h
index b028636d057416f6fd754b5aceb12048eedd0636..f0926d9d3b765f2a3555b4c86d930f5d534e9a81 100644
--- a/chrome/utility/chrome_content_utility_client.h
+++ b/chrome/utility/chrome_content_utility_client.h
@@ -6,9 +6,8 @@
 #define CHROME_UTILITY_CHROME_CONTENT_UTILITY_CLIENT_H_
 
 #include "base/compiler_specific.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
+#include "chrome/utility/profile_import_handler.h"
 #include "content/public/utility/content_utility_client.h"
 #include "printing/pdf_render_settings.h"
 
@@ -77,29 +76,7 @@ class ChromeContentUtilityClient : public content::ContentUtilityClient {
 
   void OnGetPrinterCapsAndDefaults(const std::string& printer_name);
 
-  void OnImportStart(
-      const importer::SourceProfile& source_profile,
-      uint16 items,
-      const base::DictionaryValue& localized_strings);
-  void OnImportCancel();
-  void OnImportItemFinished(uint16 item);
-
-  // The following are used with out of process profile import:
-  void ImporterCleanup();
-
-  // Thread that importer runs on, while ProfileImportThread handles messages
-  // from the browser process.
-  scoped_ptr<base::Thread> import_thread_;
-
-  // Bridge object is passed to importer, so that it can send IPC calls
-  // directly back to the ProfileImportProcessHost.
-  scoped_refptr<ExternalProcessImporterBridge> bridge_;
-
-  // A bitmask of importer::ImportItem.
-  uint16 items_to_import_;
-
-  // Importer of the appropriate type (Firefox, Safari, IE, etc.)
-  scoped_refptr<Importer> importer_;
+  ProfileImportHandler import_handler_;

[jam, 2012/07/18 16:28:33]

if you make this in a scoped_ptr, and only create it if !android, then you don't
need profile_import_handler_android.cc

[Philippe, 2012/07/18 16:54:52]

Done. Note that I still include profile_import_handler.h on all platforms to
avoid triggering the static assertion in scoped_ptr<T>::~scoped_ptr() when T =
incomplete type.

 };
 
 }  // namespace chrome