Update from https://crrev.com/312600

base/BUILD.gn

 # Copyright (c) 2013 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.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
@@ skipping 22 matching lines @@
     "android/content_uri_utils.h",
     "android/cpu_features.cc",
     "android/event_log.cc",
     "android/event_log.h",
     "android/field_trial_list.cc",
     "android/field_trial_list.h",
     "android/fifo_utils.cc",
     "android/fifo_utils.h",
     "android/important_file_writer_android.cc",
     "android/important_file_writer_android.h",
-    "android/locale_utils.cc",
-    "android/locale_utils.h",
-    "android/scoped_java_ref.cc",
-    "android/scoped_java_ref.h",
+    "android/java_handler_thread.cc",
+    "android/java_handler_thread.h",
     "android/jni_android.cc",
     "android/jni_android.h",
     "android/jni_array.cc",
     "android/jni_array.h",
     "android/jni_registrar.cc",
     "android/jni_registrar.h",
     "android/jni_string.cc",
     "android/jni_string.h",
     "android/jni_utils.cc",
     "android/jni_utils.h",
     "android/jni_weak_ref.cc",
     "android/jni_weak_ref.h",
+    "android/library_loader/library_load_from_apk_status_codes.h",
     "android/library_loader/library_loader_hooks.cc",
     "android/library_loader/library_loader_hooks.h",
-    "android/library_loader/library_load_from_apk_status_codes.h",
+    "android/locale_utils.cc",
+    "android/locale_utils.h",
     "android/memory_pressure_listener_android.cc",
     "android/memory_pressure_listener_android.h",
-    "android/java_handler_thread.cc",
-    "android/java_handler_thread.h",
     "android/path_service_android.cc",
     "android/path_service_android.h",
     "android/path_utils.cc",
     "android/path_utils.h",
+    "android/record_histogram.cc",
+    "android/record_histogram.h",
+    "android/scoped_java_ref.cc",
+    "android/scoped_java_ref.h",
     "android/sys_utils.cc",
     "android/sys_utils.h",
     "android/thread_utils.h",
     "android/trace_event_binding.cc",
     "android/trace_event_binding.h",
     "async_socket_io_handler.h",
     "async_socket_io_handler_posix.cc",
     "async_socket_io_handler_win.cc",
     "at_exit.cc",
     "at_exit.h",
@@ skipping 97 matching lines @@
     "debug/trace_event_memory.h",
     "debug/trace_event_synthetic_delay.cc",
     "debug/trace_event_synthetic_delay.h",
     "debug/trace_event_system_stats_monitor.cc",
     "debug/trace_event_system_stats_monitor.h",
     "debug/trace_event_win.cc",
     "deferred_sequenced_task_runner.cc",
     "deferred_sequenced_task_runner.h",
     "environment.cc",
     "environment.h",
-    "event_recorder.h",
-    "event_recorder_stubs.cc",
-    "event_recorder_win.cc",
     "file_descriptor_posix.h",
     "file_version_info.h",
     "file_version_info_mac.h",
     "file_version_info_mac.mm",
     "file_version_info_win.cc",
     "file_version_info_win.h",
     "files/dir_reader_fallback.h",
     "files/dir_reader_linux.h",
     "files/dir_reader_posix.h",
     "files/file.cc",
@@ skipping 650 matching lines @@
       "os_compat_nacl.cc",
       "os_compat_nacl.h",
       "rand_util_nacl.cc",
       "memory/shared_memory_nacl.cc",
     ]
   }
 
   # Windows.
   if (is_win) {
     sources -= [
-      "event_recorder_stubs.cc",
       "message_loop/message_pump_libevent.cc",
       "strings/string16.cc",
 
       # Not using sha1_win.cc because it may have caused a
       # regression to page cycler moz.
       "sha1_win.cc",
     ]
 
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     cflags = [ "/wd4267" ]
@@ skipping 576 matching lines @@
     sources = [
       "android/java/src/org/chromium/base/ApplicationStatus.java",
       "android/java/src/org/chromium/base/BuildInfo.java",
       "android/java/src/org/chromium/base/CommandLine.java",
       "android/java/src/org/chromium/base/ContentUriUtils.java",
       "android/java/src/org/chromium/base/CpuFeatures.java",
       "android/java/src/org/chromium/base/EventLog.java",
       "android/java/src/org/chromium/base/FieldTrialList.java",
       "android/java/src/org/chromium/base/ImportantFileWriterAndroid.java",
       "android/java/src/org/chromium/base/JNIUtils.java",
-      "android/java/src/org/chromium/base/library_loader/LibraryLoader.java",
+      "android/java/src/org/chromium/base/JavaHandlerThread.java",
       "android/java/src/org/chromium/base/LocaleUtils.java",
       "android/java/src/org/chromium/base/MemoryPressureListener.java",
-      "android/java/src/org/chromium/base/JavaHandlerThread.java",
       "android/java/src/org/chromium/base/PathService.java",
       "android/java/src/org/chromium/base/PathUtils.java",
       "android/java/src/org/chromium/base/PowerMonitor.java",
+      "android/java/src/org/chromium/base/SysUtils.java",
       "android/java/src/org/chromium/base/SystemMessageHandler.java",
-      "android/java/src/org/chromium/base/SysUtils.java",
       "android/java/src/org/chromium/base/ThreadUtils.java",
       "android/java/src/org/chromium/base/TraceEvent.java",
+      "android/java/src/org/chromium/base/library_loader/LibraryLoader.java",
+      "android/java/src/org/chromium/base/metrics/RecordHistogram.java",
     ]
     jni_package = "base"
   }
 
   # GYP: //base.gyp:base_java
   android_library("base_java") {
     srcjar_deps = [
       ":base_android_java_enums_srcjar",
       ":base_native_libraries_gen",
     ]
@@ skipping 55 matching lines @@
 
   # GYP: //base.gyp:base_java_unittest_support
   android_library("base_java_unittest_support") {
     deps = [
       ":base_java",
     ]
     java_files =
         [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
   }
 }