Add a flag to let render process wait for java debugger

content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java

 // Copyright 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.
 
 package org.chromium.content.browser;
 
 import android.content.Context;
 import android.graphics.SurfaceTexture;
 import android.os.RemoteException;
 import android.util.Log;
 import android.util.Pair;
 import android.view.Surface;
 
 import com.google.common.annotations.VisibleForTesting;
 
+import org.chromium.base.BaseSwitches;
 import org.chromium.base.CalledByNative;
+import org.chromium.base.CommandLine;
 import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.library_loader.Linker;
 import org.chromium.content.app.ChildProcessService;
 import org.chromium.content.app.ChromiumLinkerParams;
 import org.chromium.content.app.PrivilegedProcessService;
 import org.chromium.content.app.SandboxedProcessService;
 import org.chromium.content.common.IChildProcessCallback;
 import org.chromium.content.common.SurfaceWrapper;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * This class provides the method to start/stop ChildProcess called by native.
  */
 @JNINamespace("content")
 public class ChildProcessLauncher {
     private static final String TAG = "ChildProcessLauncher";
 
@@ skipping 312 matching lines @@
         FileDescriptorInfo[] filesToBeMapped = new FileDescriptorInfo[fileFds.length];
         for (int i = 0; i < fileFds.length; i++) {
             filesToBeMapped[i] =
                     new FileDescriptorInfo(fileIds[i], fileFds[i], fileAutoClose[i]);
         }
         assert clientContext != 0;
 
         int callbackType = CALLBACK_FOR_UNKNOWN_PROCESS;
         boolean inSandbox = true;
         String processType = getSwitchValue(commandLine, SWITCH_PROCESS_TYPE);
+        ArrayList<String> cmdList = commandLine == null ? new ArrayList<String>() :
+                new ArrayList<String>(Arrays.asList(commandLine));

[Feng Qian, 2014/08/27 17:45:29]

We should put render command line options in one place:

https://cs.corp.google.com/#clankium/src/content/browser/renderer_host/render...

[Jaekyun Seok (inactive), 2014/08/28 00:09:49]

Done.

         if (SWITCH_RENDERER_PROCESS.equals(processType)) {
+            if (CommandLine.getInstance().hasSwitch(
+                    BaseSwitches.WAIT_RENDERER_FOR_JAVA_DEBUGGER)) {
+                cmdList.add("--" + BaseSwitches.WAIT_FOR_JAVA_DEBUGGER);
+            }
             callbackType = CALLBACK_FOR_RENDERER_PROCESS;
         } else if (SWITCH_GPU_PROCESS.equals(processType)) {
             callbackType = CALLBACK_FOR_GPU_PROCESS;
         } else if (SWITCH_PPAPI_BROKER_PROCESS.equals(processType)) {
             inSandbox = false;
         }
+        String[] updatedCommandLine = cmdList.toArray(new String[0]);
 
         ChildProcessConnection allocatedConnection = null;
         synchronized (ChildProcessLauncher.class) {
             if (inSandbox) {
                 allocatedConnection = sSpareSandboxedConnection;
                 sSpareSandboxedConnection = null;
             }
         }
         if (allocatedConnection == null) {
-            allocatedConnection = allocateBoundConnection(context, commandLine, inSandbox);
+            allocatedConnection = allocateBoundConnection(context, updatedCommandLine, inSandbox);
             if (allocatedConnection == null) {
                 // Notify the native code so it can free the heap allocated callback.
                 nativeOnChildProcessStarted(clientContext, 0);
                 Log.e(TAG, "Allocation of new service failed.");
                 TraceEvent.end();
                 return;
             }
         }
 
         Log.d(TAG, "Setting up connection to process: slot=" +
                 allocatedConnection.getServiceNumber());
-        triggerConnectionSetup(allocatedConnection, commandLine, childProcessId, filesToBeMapped,
-                callbackType, clientContext);
+        triggerConnectionSetup(allocatedConnection, updatedCommandLine, childProcessId,
+                filesToBeMapped, callbackType, clientContext);
         TraceEvent.end();
     }
 
     @VisibleForTesting
     static void triggerConnectionSetup(
             final ChildProcessConnection connection,
             String[] commandLine,
             int childProcessId,
             FileDescriptorInfo[] filesToBeMapped,
             int callbackType,
@@ skipping 150 matching lines @@
         }
 
         return true;
     }
 
     private static native void nativeOnChildProcessStarted(long clientContext, int pid);
     private static native void nativeEstablishSurfacePeer(
             int pid, Surface surface, int primaryID, int secondaryID);
     private static native boolean nativeIsSingleProcess();
 }