Update from https://crrev.com/312600

base/BUILD.gn

Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 065f87174c687dbeaa266980512f1319a2077c94..e20b744be50e4472a7d6a6b33c7f60e466fc804c 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -40,10 +40,8 @@ component("base") {
     "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",
@@ -56,17 +54,21 @@ component("base") {
     "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",
@@ -184,9 +186,6 @@ component("base") {
     "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",
@@ -857,7 +856,6 @@ component("base") {
   # Windows.
   if (is_win) {
     sources -= [
-      "event_recorder_stubs.cc",
       "message_loop/message_pump_libevent.cc",
       "strings/string16.cc",
 
@@ -1454,17 +1452,18 @@ if (is_android) {
       "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/SystemMessageHandler.java",
       "android/java/src/org/chromium/base/SysUtils.java",
+      "android/java/src/org/chromium/base/SystemMessageHandler.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"
   }