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

chrome/app/chrome_main_delegate.cc

Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index a1eaf52fb5ad84d823e1e74629451b29df8f7dcd..e8433d34ddfe30686efa884e495bd33098417cef 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -636,6 +636,9 @@ void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {
 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)
@@ -651,6 +654,7 @@ int ChromeMainDelegate::RunProcess(
     if (process_type == kMainFunctions[i].name)
       return kMainFunctions[i].function(main_function_params);
   }
+#endif
 
   return -1;
 }