Disable uses of ProfileImportProcess on Android.

chrome/utility/chrome_content_utility_client.cc

 // 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.
 
 #include "chrome/utility/chrome_content_utility_client.h"
 
 #include "base/bind.h"
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
@@ skipping 64 matching lines @@
                         OnUnpackWebResource)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseUpdateManifest,
                         OnParseUpdateManifest)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_DecodeImage, OnDecodeImage)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_DecodeImageBase64, OnDecodeImageBase64)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_RenderPDFPagesToMetafile,
                         OnRenderPDFPagesToMetafile)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseJSON, OnParseJSON)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_GetPrinterCapsAndDefaults,
                         OnGetPrinterCapsAndDefaults)
+#if !defined(OS_ANDROID)
     IPC_MESSAGE_HANDLER(ProfileImportProcessMsg_StartImport,
                         OnImportStart)
     IPC_MESSAGE_HANDLER(ProfileImportProcessMsg_CancelImport,
                         OnImportCancel)
     IPC_MESSAGE_HANDLER(ProfileImportProcessMsg_ReportImportItemFinished,
                         OnImportItemFinished)
+#endif
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 bool ChromeContentUtilityClient::Send(IPC::Message* message) {
   return content::UtilityThread::Get()->Send(message);
 }
 
 void ChromeContentUtilityClient::OnUnpackExtension(
@@ skipping 283 matching lines @@
         printer_name, printer_info));
   } else
 #endif
   {
     Send(new ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Failed(
         printer_name));
   }
   content::UtilityThread::Get()->ReleaseProcessIfNeeded();
 }
 
+#if !defined(OS_ANDROID)
 void ChromeContentUtilityClient::OnImportStart(

[Yaron, 2012/07/16 19:33:39]

Does any of this logic actually intermix with the rest of this class? A quick
pass looks like all the relevant member variables are currently only accessed in
this block. If that's the case, It might be clearer to split off a separate
ImportHandler (or something to that effect) and conditionally initialize it on
Android. I think it would be more maintainable that way.

[Philippe, 2012/07/17 09:48:27]

Done. Good idea!

     const importer::SourceProfile& source_profile,
     uint16 items,
     const DictionaryValue& localized_strings) {
   bridge_ = new ExternalProcessImporterBridge(
       localized_strings, content::UtilityThread::Get(),
       base::MessageLoopProxy::current());
   importer_ = importer::CreateImporterByType(source_profile.importer_type);
   if (!importer_) {
     Send(new ProfileImportProcessHostMsg_Import_Finished(false,
         "Importer could not be created."));
@@ skipping 28 matching lines @@
   }
 }
 
 void ChromeContentUtilityClient::ImporterCleanup() {
   importer_->Cancel();
   importer_ = NULL;
   bridge_ = NULL;
   import_thread_.reset();
   content::UtilityThread::Get()->ReleaseProcessIfNeeded();
 }
+#endif
 
 }  // namespace chrome