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

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

Index: content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
index 7f06d4cb72d110fc20dff887cd2714464b0fe5b3..ab4c60dcc3609f67db06fdefd07d0f1f50b5198c 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
@@ -296,10 +296,9 @@ public class ChildProcessLauncher {
     private static long sLinkerLoadAddress = 0;
 
     private static ChromiumLinkerParams getLinkerParamsForNewConnection() {
-        Linker linker = Linker.getInstance();
         if (!sLinkerInitialized) {
-            if (linker.isUsed()) {
-                sLinkerLoadAddress = linker.getBaseLoadAddress();
+            if (Linker.isUsed()) {
+                sLinkerLoadAddress = Linker.getInstance().getBaseLoadAddress();
                 if (sLinkerLoadAddress == 0) {
                     Log.i(TAG, "Shared RELRO support disabled!");
                 }
@@ -311,11 +310,12 @@ public class ChildProcessLauncher {
 
         // Always wait for the shared RELROs in service processes.
         final boolean waitForSharedRelros = true;
-        if (Linker.areLinkerTestsEnabled()) {
+        if (Linker.areTestsEnabled()) {
+            Linker linker = Linker.getInstance();
             return new ChromiumLinkerParams(sLinkerLoadAddress,
                                             waitForSharedRelros,
                                             linker.getTestRunnerClassNameForTesting(),
-                                            linker.getLinkerImplementationForTesting());
+                                            linker.getImplementationForTesting());
         } else {
             return new ChromiumLinkerParams(sLinkerLoadAddress,
                                             waitForSharedRelros);