Revert "Revert 155950 - Add initial Chromium TestShell support for Android"

chrome/app/chrome_main_delegate.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/app/chrome_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/metrics/field_trial.h"
@@ skipping 618 matching lines @@
   AdjustLinuxOOMScore(process_type);
 #endif
 #if defined(OS_WIN)
   SuppressWindowsErrorDialogs();
 #endif
 }
 
 int ChromeMainDelegate::RunProcess(
     const std::string& process_type,
     const content::MainFunctionParams& main_function_params) {
+  // ANDROID doesn't support "service", so no ServiceProcessMain, and arraysize
+  // doesn't support empty array. So we comment out the block for Android.
+#if !defined(OS_ANDROID)
   static const MainFunction kMainFunctions[] = {
     { switches::kServiceProcess,     ServiceProcessMain },
 #if defined(OS_MACOSX)
     { switches::kRelauncherProcess,
       mac_relauncher::internal::RelauncherMain },
 #endif
 #if !defined(DISABLE_NACL)
     { switches::kNaClLoaderProcess, NaClMain },
 #endif  // DISABLE_NACL
   };
 
   for (size_t i = 0; i < arraysize(kMainFunctions); ++i) {
     if (process_type == kMainFunctions[i].name)
       return kMainFunctions[i].function(main_function_params);
   }
+#endif
 
   return -1;
 }
 
 void ChromeMainDelegate::ProcessExiting(const std::string& process_type) {
   if (SubprocessNeedsResourceBundle(process_type))
     ResourceBundle::CleanupSharedInstance();
 
   logging::CleanupChromeLogging();
 }
@@ skipping 52 matching lines @@
 
 content::ContentRendererClient*
     ChromeMainDelegate::CreateContentRendererClient() {
   return &g_chrome_content_renderer_client.Get();
 }
 
 content::ContentUtilityClient*
     ChromeMainDelegate::CreateContentUtilityClient() {
   return &g_chrome_content_utility_client.Get();
 }