Update from https://crrev.com/312600

base/base.gypi

 # Copyright (c) 2012 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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
       'base_i18n_target': 0,
     },
@@ skipping 54 matching lines @@
           'android/library_loader/library_loader_hooks.h',
           'android/library_loader/library_load_from_apk_status_codes.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/sys_utils.cc',
           'android/sys_utils.h',
           'android/thread_utils.h',
           'android/trace_event_binding.cc',
           'android/trace_event_binding.h',
           'at_exit.cc',
           'at_exit.h',
           'atomic_ref_count.h',
           'atomic_sequence_num.h',
           'atomicops.h',
@@ skipping 835 matching lines @@
           ],
           ['OS != "openbsd" or >(nacl_untrusted_build)==1', {
               'sources/': [ ['exclude', '_openbsd\\.cc$'] ],
             },
           ],
           ['OS == "win" and >(nacl_untrusted_build)==0', {
             'include_dirs': [
               '<(DEPTH)/third_party/wtl/include',
             ],
             'sources!': [
-              'event_recorder_stubs.cc',
               'files/file_path_watcher_fsevents.cc',
               'files/file_path_watcher_fsevents.h',
               'files/file_path_watcher_kqueue.cc',
               'files/file_path_watcher_kqueue.h',
               'files/file_path_watcher_stub.cc',
               'message_loop/message_pump_libevent.cc',
               'posix/file_descriptor_shuffle.cc',
               # Not using sha1_win.cc because it may have caused a
               # regression to page cycler moz.
               'sha1_win.cc',
@@ skipping 88 matching lines @@
           'i18n/time_formatting.h',
           'i18n/timezone.cc',
           'i18n/timezone.h',
           'i18n/utf8_validator_tables.cc',
           'i18n/utf8_validator_tables.h',
         ],
       }]
     ],
   },
 }