Update from https://crrev.com/312600

base/base.gyp

Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 5d26fc4d44528fa315ed60b8bec381de76469b33..114cad64ac16bbc88905e4904b63eef80da44798 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -230,15 +230,10 @@
         }],
       ],
       'sources': [
-        'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
-        'third_party/xdg_user_dirs/xdg_user_dir_lookup.h',
         'async_socket_io_handler.h',
         'async_socket_io_handler_posix.cc',
         'async_socket_io_handler_win.cc',
         'auto_reset.h',
-        'event_recorder.h',
-        'event_recorder_stubs.cc',
-        'event_recorder_win.cc',
         'linux_util.cc',
         'linux_util.h',
         'message_loop/message_pump_android.cc',
@@ -256,8 +251,10 @@
         'posix/file_descriptor_shuffle.cc',
         'posix/file_descriptor_shuffle.h',
         'sync_socket.h',
-        'sync_socket_win.cc',
         'sync_socket_posix.cc',
+        'sync_socket_win.cc',
+        'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
+        'third_party/xdg_user_dirs/xdg_user_dir_lookup.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
@@ -1166,15 +1163,10 @@
             4267,
           ],
           'sources': [
-            'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
-            'third_party/xdg_user_dirs/xdg_user_dir_lookup.h',
             'async_socket_io_handler.h',
             'async_socket_io_handler_posix.cc',
             'async_socket_io_handler_win.cc',
             'auto_reset.h',
-            'event_recorder.h',
-            'event_recorder_stubs.cc',
-            'event_recorder_win.cc',
             'linux_util.cc',
             'linux_util.h',
             'md5.cc',
@@ -1186,8 +1178,10 @@
             'posix/file_descriptor_shuffle.cc',
             'posix/file_descriptor_shuffle.h',
             'sync_socket.h',
-            'sync_socket_win.cc',
             'sync_socket_posix.cc',
+            'sync_socket_win.cc',
+            'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
+            'third_party/xdg_user_dirs/xdg_user_dir_lookup.h',
           ],
         },
         {
@@ -1342,17 +1336,18 @@
             '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',
           ],
           'variables': {
             'jni_gen_package': 'base',