Update from chromium https://crrev.com/301725/

base/android/library_loader/library_loader_hooks.cc

 // Copyright 2014 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.
 
 #include "base/android/library_loader/library_loader_hooks.h"
 
 #include "base/android/command_line_android.h"
 #include "base/android/jni_string.h"
+#include "base/android/library_loader/library_load_from_apk_status_codes.h"
 #include "base/at_exit.h"
 #include "base/metrics/histogram.h"
 #include "jni/LibraryLoader_jni.h"
 
 namespace base {
 namespace android {
 
 namespace {
 
 base::AtExitManager* g_at_exit_manager = NULL;
@@ skipping 20 matching lines @@
 
   // Low-memory browser loads at fixed address, success or fail.
   LOW_MEMORY_LFA_SUCCESS = 1,
   LOW_MEMORY_LFA_BACKOFF_USED = 2,
 
   MAX_BROWSER_HISTOGRAM_CODE = 3,
 };
 
 RendererHistogramCode g_renderer_histogram_code = NO_PENDING_HISTOGRAM_CODE;
 
-enum LibraryLoadFromApkSupportCode {
-  // The device's support for loading a library directly from the APK file.
-  NOT_SUPPORTED = 0,
-  SUPPORTED = 1,
-
-  MAX_LIBRARY_LOAD_FROM_APK_SUPPORT_CODE = 2,
-};
-
 } // namespace
 
 static void RegisterChromiumAndroidLinkerRendererHistogram(
     JNIEnv* env,
     jclass clazz,
     jboolean requested_shared_relro,
     jboolean load_at_fixed_address_failed) {
   // Note a pending histogram value for later recording.
   if (requested_shared_relro) {
     g_renderer_histogram_code = load_at_fixed_address_failed
@@ skipping 11 matching lines @@
                             g_renderer_histogram_code,
                             MAX_RENDERER_HISTOGRAM_CODE);
   g_renderer_histogram_code = NO_PENDING_HISTOGRAM_CODE;
 }
 
 static void RecordChromiumAndroidLinkerBrowserHistogram(
     JNIEnv* env,
     jclass clazz,
     jboolean is_using_browser_shared_relros,
     jboolean load_at_fixed_address_failed,
-    jboolean library_load_from_apk_supported) {
+    jint library_load_from_apk_status) {
   // For low-memory devices, record whether or not we successfully loaded the
   // browser at a fixed address. Otherwise just record a normal invocation.
   BrowserHistogramCode histogram_code;
   if (is_using_browser_shared_relros) {
     histogram_code = load_at_fixed_address_failed
                      ? LOW_MEMORY_LFA_BACKOFF_USED : LOW_MEMORY_LFA_SUCCESS;
   } else {
     histogram_code = NORMAL_LRA_SUCCESS;
   }
   UMA_HISTOGRAM_ENUMERATION("ChromiumAndroidLinker.BrowserStates",
                             histogram_code,
                             MAX_BROWSER_HISTOGRAM_CODE);
 
-  // Record whether the device supports loading a library directly from the APK
-  // file.
-  UMA_HISTOGRAM_ENUMERATION("ChromiumAndroidLinker.LibraryLoadFromApkSupported",
-                            library_load_from_apk_supported ?
-                                SUPPORTED : NOT_SUPPORTED,
-                            MAX_LIBRARY_LOAD_FROM_APK_SUPPORT_CODE);
+  // Record the device support for loading a library directly from the APK file.
+  UMA_HISTOGRAM_ENUMERATION("ChromiumAndroidLinker.LibraryLoadFromApkStatus",
+                            library_load_from_apk_status,
+                            LIBRARY_LOAD_FROM_APK_STATUS_CODES_MAX);
 }
 
 void SetLibraryLoadedHook(LibraryLoadedHook* func) {
   g_registration_callback = func;
 }
 
 static void InitCommandLine(JNIEnv* env, jclass clazz,
                             jobjectArray init_command_line) {
   InitNativeCommandLineFromJavaArray(env, init_command_line);
 }
@@ skipping 26 matching lines @@
 jstring GetVersionNumber(JNIEnv* env, jclass clazz) {
   return ConvertUTF8ToJavaString(env, g_library_version_number).Release();
 }
 
 static void RecordNativeLibraryHack(JNIEnv*, jclass, jboolean usedHack) {
   UMA_HISTOGRAM_BOOLEAN("LibraryLoader.NativeLibraryHack", usedHack);
 }
 
 }  // namespace android
 }  // namespace base