Make service name for sandboxed process configurable so that client can use different set of sandbo…

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

 // 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.
 
 package org.chromium.content.browser;
 
 import android.content.Context;
-import android.os.RemoteException;
 import android.util.Log;
 import android.view.Surface;
 
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
 import org.chromium.content.app.LibraryLoader;
+import org.chromium.content.app.SandboxedProcessService;
 import org.chromium.content.common.ISandboxedProcessCallback;
 import org.chromium.content.common.ISandboxedProcessService;
 
 /**
  * This class provides the method to start/stop SandboxedProcess called by
  * native.
  */
 @JNINamespace("content")
 public class SandboxedProcessLauncher {
     private static String TAG = "SandboxedProcessLauncher";
@@ skipping 18 matching lines @@
     // set when we don't expect them to).
     // SHOULD BE ACCESSED WITH THE mConnections LOCK.
     private static final ArrayList<Integer> mFreeConnectionIndices =
         new ArrayList<Integer>(MAX_REGISTERED_SERVICES);
     static {
         for (int i = 0; i < MAX_REGISTERED_SERVICES; i++) {
             mFreeConnectionIndices.add(i);
         }
     }
 
+    // Service class for sandboxed process. As the default value it uses
+    // SandboxedProcessService.
+    private static Class<? extends SandboxedProcessService> mServiceClass =
+            SandboxedProcessService.class;
+    private static boolean mConnectionAllocated = false;
+
+    // Sets service class for sandboxed service.
+    public static void setServiceClass(Class<? extends SandboxedProcessService> serviceClass) {
+        // We should guarantee this is called before allocating connection.
+        assert !mConnectionAllocated;
+        mServiceClass = serviceClass;
+    }
+
     private static SandboxedProcessConnection allocateConnection(Context context) {
         SandboxedProcessConnection.DeathCallback deathCallback =
             new SandboxedProcessConnection.DeathCallback() {
                 @Override
                 public void onSandboxedProcessDied(int pid) {
                     stop(pid);
                 }
             };
         synchronized (mConnections) {
             if (mFreeConnectionIndices.isEmpty()) {
                 Log.w(TAG, "Ran out of sandboxed services.");
                 return null;
             }
             int slot = mFreeConnectionIndices.remove(0);
             assert mConnections[slot] == null;
-            mConnections[slot] = new SandboxedProcessConnection(context, slot, deathCallback);
+            mConnections[slot] = new SandboxedProcessConnection(context, slot, deathCallback,
+                    mServiceClass);
+            mConnectionAllocated = true;
             return mConnections[slot];
         }
     }
 
     private static SandboxedProcessConnection allocateBoundConnection(Context context,
             String[] commandLine) {
         SandboxedProcessConnection connection = allocateConnection(context);
         if (connection != null) {
             String libraryName = LibraryLoader.getLibraryToLoad();
             assert libraryName != null : "Attempting to launch a sandbox process without first "
@@ skipping 223 matching lines @@
                 return nativeGetViewSurface(surfaceId);
             }
         };
     };
 
     private static native void nativeOnSandboxedProcessStarted(int clientContext, int pid);
     private static native Surface nativeGetViewSurface(int surfaceId);
     private static native void nativeEstablishSurfacePeer(
             int pid, Surface surface, int primaryID, int secondaryID);
 }