Update to Chromium //base at Chromium commit e3a753f17bac62738b0dbf0b36510f767b081e4b.

android/java/src/org/chromium/base/library_loader/ModernLinker.java

 // Copyright 2015 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.base.library_loader;
 
 import android.os.Bundle;
 import android.os.SystemClock;
 
 import org.chromium.base.Log;
@@ skipping 52 matching lines @@
 
     // The directory used to hold shared RELRO data files. Set up by prepareLibraryLoad().
     private String mDataDirectory = null;
 
     // Private singleton constructor, and singleton factory method.
     private ModernLinker() {}
     static Linker create() {
         return new ModernLinker();
     }
 
-    // Used internally to initialize the linker's data. Assume lock is held.
+    // Used internally to initialize the linker's data. Assumes lock is held.
     private void ensureInitializedLocked() {
         assert Thread.holdsLock(mLock);
         assert NativeLibraries.sUseLinker;
 
-        // On first call, load libchromium_android_linker.so.
+        // On first call, load libchromium_android_linker.so. Cannot be done in the
+        // constructor because the instance is constructed on the UI thread.
         if (!mInitialized) {
-            loadLinkerJNILibrary();
+            loadLinkerJniLibrary();
             mInitialized = true;
         }
     }
 
     /**
-     * Call this method to determine if this chromium project must
-     * use this linker. If not, System.loadLibrary() should be used to load
-     * libraries instead.
-     */
-    @Override
-    public boolean isUsed() {
-        // Only GYP targets that are APKs and have the 'use_chromium_linker' variable
-        // defined as 1 will use this linker. For all others (the default), the
-        // auto-generated NativeLibraries.sUseLinker variable will be false.
-        return NativeLibraries.sUseLinker;
-    }
-
-    /**
      * Call this method to determine if the linker will try to use shared RELROs
      * for the browser process.
      */
     @Override
     public boolean isUsingBrowserSharedRelros() {
         // This Linker does not attempt to share RELROS between the browser and
         // the renderers, but only between renderers.
         return false;
     }
 
@@ skipping 386 matching lines @@
      * @param loadAddress load address, which can be different from the one
      * used to load the library in the current process!
      * @param relroPath Path to the shared RELRO file for this library.
      * @param libInfo libInfo instance. On success, the mRelroStart, mRelroSize
      * and mRelroFd will be set.
      * @return true on success, false otherwise.
      */
     private static native boolean nativeCreateSharedRelro(
             String dlopenExtPath, long loadAddress, String relroPath, LibInfo libInfo);
 }