Fix low-memory devices crashing on Chrome start up during UMA recodring

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

Index: base/android/java/src/org/chromium/base/library_loader/Linker.java
diff --git a/base/android/java/src/org/chromium/base/library_loader/Linker.java b/base/android/java/src/org/chromium/base/library_loader/Linker.java
index cc30af4d5d21b830a562ced77c139f8f3b2ef782..1634160c2ea78bfaa80b80383c27df2953aa7b90 100644
--- a/base/android/java/src/org/chromium/base/library_loader/Linker.java
+++ b/base/android/java/src/org/chromium/base/library_loader/Linker.java
@@ -196,6 +196,8 @@ public class Linker {
     private static boolean sRelroSharingSupported = false;
 
     // Set to true if this runs in the browser process. Disabled by initServiceProcess().
+    // TODO(petrcermak): This flag can be incorrectly set to false (even though this might run in
+    // the browser process) on low-memory devices.
     private static boolean sInBrowserProcess = true;
 
     // Becomes true to indicate this process needs to wait for a shared RELRO in
@@ -382,19 +384,6 @@ public class Linker {
     }
 
     /**
-     * Call this method to determine if the linker is running in the browser
-     * process.
-     *
-     * @return true if the linker is running in the browser process.
-     */
-    public static boolean isInBrowserProcess() {
-        synchronized (Linker.class) {
-            ensureInitializedLocked();
-            return sInBrowserProcess;
-        }
-    }
-
-    /**
      * Call this method to determine if the chromium project must load
      * the library directly from the zip file.
      */
@@ -835,10 +824,11 @@ public class Linker {
     /**
      * Check whether the device supports loading a library directly from the APK file.
      *
-     * @param apkFile Filename of the APK.
+     * @param apkFile Filename of the APK (not null).

[rmcilroy, 2014/10/20 10:42:39]

this is usually implied (with params which can be null marked as such instead).

[petrcermak, 2014/10/20 15:33:22]

Removed.

      * @return true if supported.
      */
     public static boolean checkLibraryLoadFromApkSupport(String apkFile) {
+        assert apkFile != null;
         synchronized (Linker.class) {
             ensureInitializedLocked();