Make Linker.isUsed() static, and clean up the fallout.

content/public/android/java/src/org/chromium/content/app/ChildProcessService.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.app;
 
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.SurfaceTexture;
@@ skipping 51 matching lines @@
     // Linker-specific parameters for this child process service.
     private ChromiumLinkerParams mLinkerParams;
 
     private static AtomicReference<Context> sContext = new AtomicReference<Context>(null);
     private boolean mLibraryInitialized = false;
     // Becomes true once the service is bound. Access must synchronize around mMainThread.
     private boolean mIsBound = false;
 
     private final Semaphore mActivitySemaphore = new Semaphore(1);
 
+    // Return a Linker instance. If testing, the Linker needs special setup.
+    private Linker getLinker() {
+        if (Linker.areTestsEnabled()) {
+            // For testing, set the Linker implementation and the test runner
+            // class name to match those used by the parent.
+            assert mLinkerParams != null;
+            Linker.setupForTesting(
+                    mLinkerParams.mLinkerImplementationForTesting,
+                    mLinkerParams.mTestRunnerClassNameForTesting);
+        }
+        return Linker.getInstance();
+    }
+
     // Binder object used by clients for this service.
     private final IChildProcessService.Stub mBinder = new IChildProcessService.Stub() {
         // NOTE: Implement any IChildProcessService methods here.
         @Override
         public int setupConnection(Bundle args, IChildProcessCallback callback) {
             mCallback = callback;
             // Required to unparcel FileDescriptorInfo.
             args.setClassLoader(getClassLoader());
             synchronized (mMainThread) {
                 // Allow the command line to be set via bind() intent or setupConnection, but
                 // the FD can only be transferred here.
                 if (mCommandLineParams == null) {
                     mCommandLineParams = args.getStringArray(
                             ChildProcessConnection.EXTRA_COMMAND_LINE);
                 }
                 // We must have received the command line by now
                 assert mCommandLineParams != null;
                 mCpuCount = args.getInt(ChildProcessConnection.EXTRA_CPU_COUNT);
                 mCpuFeatures = args.getLong(ChildProcessConnection.EXTRA_CPU_FEATURES);
                 assert mCpuCount > 0;
                 Parcelable[] fdInfosAsParcelable =
                         args.getParcelableArray(ChildProcessConnection.EXTRA_FILES);
                 // For why this arraycopy is necessary:
                 // http://stackoverflow.com/questions/8745893/i-dont-get-why-this-classcastexception-occurs
                 mFdInfos = new FileDescriptorInfo[fdInfosAsParcelable.length];
                 System.arraycopy(fdInfosAsParcelable, 0, mFdInfos, 0, fdInfosAsParcelable.length);
                 Bundle sharedRelros = args.getBundle(Linker.EXTRA_LINKER_SHARED_RELROS);
                 if (sharedRelros != null) {
-                    Linker.getInstance().useSharedRelros(sharedRelros);
+                    getLinker().useSharedRelros(sharedRelros);
                     sharedRelros = null;
                 }
                 mMainThread.notifyAll();
             }
             return Process.myPid();
         }
 
         @Override
         public void crashIntentionallyForTesting() {
             Process.killProcess(Process.myPid());
         }
     };
 
     /* package */ static Context getContext() {
         return sContext.get();
     }
 
-    // Return a new Linker instance. If testing, the Linker needs special setup.
-    private Linker getLinker() {
-        if (Linker.areLinkerTestsEnabled()) {
-            // If testing, set the Linker implementation and the test runner
-            // class name to match the one used by the parent.
-            assert mLinkerParams != null;
-            Linker.setLinkerImplementationForTesting(
-                    mLinkerParams.mLinkerImplementationForTesting);
-            Linker linker = Linker.getInstance();
-            linker.setTestRunnerClassNameForTesting(
-                    mLinkerParams.mTestRunnerClassNameForTesting);
-            return linker;
-        }
-        // Not testing, so return a normal the Linker instantiation.
-        return Linker.getInstance();
-    }
-
     @Override
     public void onCreate() {
         Log.i(TAG, "Creating new ChildProcessService pid=%d", Process.myPid());
         if (sContext.get() != null) {
             throw new RuntimeException("Illegal child process reuse.");
         }
         sContext.set(this);
         super.onCreate();
 
         mMainThread = new Thread(new Runnable() {
             @Override
             @SuppressFBWarnings("DM_EXIT")
             public void run()  {
                 try {
-                    // CommandLine must be initialized before others, e.g., Linker.isUsed()
-                    // may check the command line options.
+                    // CommandLine must be initialized before everything else.
                     synchronized (mMainThread) {
                         while (mCommandLineParams == null) {
                             mMainThread.wait();
                         }
                     }
                     CommandLine.init(mCommandLineParams);
-                    Linker linker = getLinker();
-                    boolean useLinker = linker.isUsed();
+
+                    Linker linker = null;
                     boolean requestedSharedRelro = false;
-                    if (useLinker) {
+                    if (Linker.isUsed()) {
                         synchronized (mMainThread) {
                             while (!mIsBound) {
                                 mMainThread.wait();
                             }
                         }
+                        linker = getLinker();
                         if (mLinkerParams.mWaitForSharedRelro) {
                             requestedSharedRelro = true;
                             linker.initServiceProcess(mLinkerParams.mBaseLoadAddress);
                         } else {
                             linker.disableSharedRelros();
                         }
                     }
                     boolean isLoaded = false;
                     if (CommandLine.getInstance().hasSwitch(
                             BaseSwitches.RENDERER_WAIT_FOR_JAVA_DEBUGGER)) {
@@ skipping 233 matching lines @@
     private static native void nativeInitChildProcess(
             ChildProcessService service, int cpuCount, long cpuFeatures);
 
     /**
      * Force the child process to exit.
      */
     private static native void nativeExitChildProcess();
 
     private native void nativeShutdownMainThread();
 }