Update from https://crrev.com/316786

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,
     },
     'target_conditions': [
       # This part is shared between the targets defined below.
       ['base_target==1', {
         'sources': [
           '../build/build_config.h',
-          'third_party/dmg_fp/dmg_fp.h',
-          'third_party/dmg_fp/g_fmt.cc',
-          'third_party/dmg_fp/dtoa_wrapper.cc',
-          'third_party/icu/icu_utf.cc',
-          'third_party/icu/icu_utf.h',
-          'third_party/nspr/prtime.cc',
-          'third_party/nspr/prtime.h',
-          'third_party/superfasthash/superfasthash.c',
-          'third_party/xdg_mime/xdgmime.h',
           'allocator/allocator_extension.cc',
           'allocator/allocator_extension.h',
           'allocator/type_profiler_control.cc',
           'allocator/type_profiler_control.h',
           'android/application_status_listener.cc',
           'android/application_status_listener.h',
           'android/base_jni_onload.cc',
           'android/base_jni_onload.h',
           'android/base_jni_registrar.cc',
           'android/base_jni_registrar.h',
           'android/build_info.cc',
           'android/build_info.h',
           'android/command_line_android.cc',
           'android/command_line_android.h',
           'android/content_uri_utils.cc',
           '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.h',
-          'android/locale_utils.cc',
-          '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_onload_delegate.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',
           'at_exit.cc',
           'at_exit.h',
           'atomic_ref_count.h',
           'atomic_sequence_num.h',
           'atomicops.h',
@@ skipping 121 matching lines @@
           'files/file_util.cc',
           'files/file_util.h',
           'files/file_util_android.cc',
           'files/file_util_linux.cc',
           'files/file_util_mac.mm',
           'files/file_util_posix.cc',
           'files/file_util_proxy.cc',
           'files/file_util_proxy.h',
           'files/file_util_win.cc',
           'files/file_win.cc',
+          'files/important_file_writer.cc',
           'files/important_file_writer.h',
-          'files/important_file_writer.cc',
           'files/memory_mapped_file.cc',
           'files/memory_mapped_file.h',
           'files/memory_mapped_file_posix.cc',
           'files/memory_mapped_file_win.cc',
           'files/scoped_file.cc',
           'files/scoped_file.h',
           'files/scoped_temp_dir.cc',
           'files/scoped_temp_dir.h',
           'float_util.h',
           'format_macros.h',
           'gtest_prod_util.h',
           'guid.cc',
           'guid.h',
           'guid_posix.cc',
           'guid_win.cc',
           'hash.cc',
           'hash.h',
           'id_map.h',
           'ios/block_types.h',
+          'ios/crb_protocol_observers.h',
+          'ios/crb_protocol_observers.mm',
           'ios/device_util.h',
           'ios/device_util.mm',
           'ios/ios_util.h',
           'ios/ios_util.mm',
           'ios/scoped_critical_action.h',
           'ios/scoped_critical_action.mm',
           'ios/weak_nsobject.h',
           'ios/weak_nsobject.mm',
           'json/json_file_value_serializer.cc',
           'json/json_file_value_serializer.h',
@@ skipping 25 matching lines @@
           'mac/close_nocancel.cc',
           'mac/cocoa_protocols.h',
           'mac/foundation_util.h',
           'mac/foundation_util.mm',
           'mac/launch_services_util.cc',
           'mac/launch_services_util.h',
           'mac/launchd.cc',
           'mac/launchd.h',
           'mac/libdispatch_task_runner.cc',
           'mac/libdispatch_task_runner.h',
+          'mac/mac_logging.cc',
           'mac/mac_logging.h',
-          'mac/mac_logging.cc',
           'mac/mac_util.h',
           'mac/mac_util.mm',
           'mac/mach_logging.cc',
           'mac/mach_logging.h',
           'mac/objc_property_releaser.h',
           'mac/objc_property_releaser.mm',
           'mac/os_crash_dumps.cc',
           'mac/os_crash_dumps.h',
           'mac/scoped_aedesc.h',
           'mac/scoped_authorizationref.h',
@@ skipping 71 matching lines @@
           'message_loop/message_loop_proxy_impl.h',
           'message_loop/message_pump.cc',
           'message_loop/message_pump.h',
           'message_loop/message_pump_android.cc',
           'message_loop/message_pump_android.h',
           'message_loop/message_pump_default.cc',
           'message_loop/message_pump_default.h',
           'message_loop/message_pump_win.cc',
           'message_loop/message_pump_win.h',
           'message_loop/timer_slack.h',
-          'metrics/sample_map.cc',
-          'metrics/sample_map.h',
-          'metrics/sample_vector.cc',
-          'metrics/sample_vector.h',
           'metrics/bucket_ranges.cc',
           'metrics/bucket_ranges.h',
           'metrics/histogram.cc',
           'metrics/histogram.h',
           'metrics/histogram_base.cc',
           'metrics/histogram_base.h',
           'metrics/histogram_delta_serialization.cc',
           'metrics/histogram_delta_serialization.h',
           'metrics/histogram_flattener.h',
           'metrics/histogram_macros.h',
           'metrics/histogram_samples.cc',
           'metrics/histogram_samples.h',
           'metrics/histogram_snapshot_manager.cc',
           'metrics/histogram_snapshot_manager.h',
+          'metrics/sample_map.cc',
+          'metrics/sample_map.h',
+          'metrics/sample_vector.cc',
+          'metrics/sample_vector.h',
           'metrics/sparse_histogram.cc',
           'metrics/sparse_histogram.h',
           'metrics/statistics_recorder.cc',
           'metrics/statistics_recorder.h',
-          'metrics/stats_counters.cc',
-          'metrics/stats_counters.h',
-          'metrics/stats_table.cc',
-          'metrics/stats_table.h',
           'metrics/user_metrics.cc',
           'metrics/user_metrics.h',
           'metrics/user_metrics_action.h',
           'move.h',
           'native_library.h',
           'native_library_mac.mm',
           'native_library_posix.cc',
           'native_library_win.cc',
           'nix/mime_util_xdg.cc',
           'nix/mime_util_xdg.h',
           'nix/xdg_util.cc',
           'nix/xdg_util.h',
+          'numerics/safe_conversions.h',
+          'numerics/safe_conversions_impl.h',
+          'numerics/safe_math.h',
+          'numerics/safe_math_impl.h',
           'observer_list.h',
           'observer_list_threadsafe.h',
           'os_compat_android.cc',
           'os_compat_android.h',
           'os_compat_nacl.cc',
           'os_compat_nacl.h',
           'path_service.cc',
           'path_service.h',
           'pending_task.cc',
           'pending_task.h',
           'pickle.cc',
           'pickle.h',
           'port.h',
           'posix/eintr_wrapper.h',
           'posix/global_descriptors.cc',
           'posix/global_descriptors.h',
           'posix/unix_domain_socket_linux.cc',
           'posix/unix_domain_socket_linux.h',
           'power_monitor/power_monitor.cc',
           'power_monitor/power_monitor.h',
+          'power_monitor/power_monitor_device_source.cc',
+          'power_monitor/power_monitor_device_source.h',
           'power_monitor/power_monitor_device_source_android.cc',
           'power_monitor/power_monitor_device_source_android.h',
           'power_monitor/power_monitor_device_source_chromeos.cc',
-          'power_monitor/power_monitor_device_source.cc',
-          'power_monitor/power_monitor_device_source.h',
           'power_monitor/power_monitor_device_source_ios.mm',
           'power_monitor/power_monitor_device_source_mac.mm',
           'power_monitor/power_monitor_device_source_posix.cc',
           'power_monitor/power_monitor_device_source_win.cc',
           'power_monitor/power_monitor_source.cc',
           'power_monitor/power_monitor_source.h',
           'power_monitor/power_observer.h',
           'process/internal_linux.cc',
           'process/internal_linux.h',
           'process/kill.cc',
           'process/kill.h',
           'process/kill_mac.cc',
           'process/kill_posix.cc',
           'process/kill_win.cc',
           'process/launch.cc',
           'process/launch.h',
           'process/launch_ios.cc',
           'process/launch_mac.cc',
           'process/launch_posix.cc',
           'process/launch_win.cc',
+          'process/memory.cc',
           'process/memory.h',
-          'process/memory.cc',
           'process/memory_linux.cc',
           'process/memory_mac.mm',
           'process/memory_win.cc',
           'process/process.h',
           'process/process_handle_freebsd.cc',
           'process/process_handle_linux.cc',
           'process/process_handle_mac.cc',
           'process/process_handle_openbsd.cc',
           'process/process_handle_posix.cc',
           'process/process_handle_win.cc',
           'process/process_info.h',
           'process/process_info_linux.cc',
           'process/process_info_mac.cc',
           'process/process_info_win.cc',
           'process/process_iterator.cc',
           'process/process_iterator.h',
           'process/process_iterator_freebsd.cc',
           'process/process_iterator_linux.cc',
           'process/process_iterator_mac.cc',
           'process/process_iterator_openbsd.cc',
           'process/process_iterator_win.cc',
           'process/process_linux.cc',
+          'process/process_metrics.cc',
           'process/process_metrics.h',
-          'process/process_metrics.cc',
           'process/process_metrics_freebsd.cc',
           'process/process_metrics_ios.cc',
           'process/process_metrics_linux.cc',
           'process/process_metrics_mac.cc',
           'process/process_metrics_openbsd.cc',
           'process/process_metrics_posix.cc',
           'process/process_metrics_win.cc',
           'process/process_posix.cc',
           'process/process_win.cc',
           'profiler/alternate_timer.cc',
           'profiler/alternate_timer.h',
           'profiler/scoped_profile.cc',
           'profiler/scoped_profile.h',
           'profiler/scoped_tracker.cc',
           'profiler/scoped_tracker.h',
           'profiler/tracked_time.cc',
           'profiler/tracked_time.h',
           'rand_util.cc',
           'rand_util.h',
           'rand_util_nacl.cc',
           'rand_util_posix.cc',
           'rand_util_win.cc',
           'run_loop.cc',
           'run_loop.h',
-          'numerics/safe_conversions.h',
-          'numerics/safe_conversions_impl.h',
-          'numerics/safe_math.h',
-          'numerics/safe_math_impl.h',
           'safe_strerror_posix.cc',
           'safe_strerror_posix.h',
           'scoped_generic.h',
           'scoped_native_library.cc',
           'scoped_native_library.h',
           'scoped_observer.h',
           'sequence_checker.h',
           'sequence_checker_impl.cc',
           'sequence_checker_impl.h',
           'sequenced_task_runner.cc',
           'sequenced_task_runner.h',
           'sequenced_task_runner_helpers.h',
           'sha1.h',
           'sha1_portable.cc',
           'sha1_win.cc',
           'single_thread_task_runner.h',
           'stl_util.h',
           'strings/latin1_string_conversions.cc',
           'strings/latin1_string_conversions.h',
           'strings/nullable_string16.cc',
           'strings/nullable_string16.h',
           'strings/safe_sprintf.cc',
           'strings/safe_sprintf.h',
           'strings/string16.cc',
           'strings/string16.h',
           'strings/string_number_conversions.cc',
-          'strings/string_split.cc',
-          'strings/string_split.h',
           'strings/string_number_conversions.h',
           'strings/string_piece.cc',
           'strings/string_piece.h',
+          'strings/string_split.cc',
+          'strings/string_split.h',
           'strings/string_tokenizer.h',
           'strings/string_util.cc',
           'strings/string_util.h',
           'strings/string_util_constants.cc',
           'strings/string_util_posix.h',
           'strings/string_util_win.h',
           'strings/stringize_macros.h',
           'strings/stringprintf.cc',
           'strings/stringprintf.h',
           'strings/sys_string_conversions.h',
@@ skipping 18 matching lines @@
           'synchronization/lock_impl.h',
           'synchronization/lock_impl_posix.cc',
           'synchronization/lock_impl_win.cc',
           'synchronization/spin_wait.h',
           'synchronization/waitable_event.h',
           'synchronization/waitable_event_posix.cc',
           'synchronization/waitable_event_watcher.h',
           'synchronization/waitable_event_watcher_posix.cc',
           'synchronization/waitable_event_watcher_win.cc',
           'synchronization/waitable_event_win.cc',
-          'system_monitor/system_monitor.cc',
-          'system_monitor/system_monitor.h',
           'sys_byteorder.h',
           'sys_info.cc',
           'sys_info.h',
           'sys_info_android.cc',
           'sys_info_chromeos.cc',
           'sys_info_freebsd.cc',
           'sys_info_internal.h',
           'sys_info_ios.mm',
           'sys_info_linux.cc',
           'sys_info_mac.cc',
           'sys_info_openbsd.cc',
           'sys_info_posix.cc',
           'sys_info_win.cc',
+          'system_monitor/system_monitor.cc',
+          'system_monitor/system_monitor.h',
           'task/cancelable_task_tracker.cc',
           'task/cancelable_task_tracker.h',
           'task_runner.cc',
           'task_runner.h',
           'task_runner_util.h',
           'template_util.h',
+          'third_party/dmg_fp/dmg_fp.h',
+          'third_party/dmg_fp/dtoa_wrapper.cc',
+          'third_party/dmg_fp/g_fmt.cc',
+          'third_party/icu/icu_utf.cc',
+          'third_party/icu/icu_utf.h',
+          'third_party/nspr/prtime.cc',
+          'third_party/nspr/prtime.h',
+          'third_party/superfasthash/superfasthash.c',
+          'third_party/xdg_mime/xdgmime.h',
           'thread_task_runner_handle.cc',
           'thread_task_runner_handle.h',
           'threading/non_thread_safe.h',
           'threading/non_thread_safe_impl.cc',
           'threading/non_thread_safe_impl.h',
           'threading/platform_thread.h',
           'threading/platform_thread_android.cc',
           'threading/platform_thread_linux.cc',
           'threading/platform_thread_mac.mm',
           'threading/platform_thread_posix.cc',
@@ skipping 14 matching lines @@
           'threading/thread_id_name_manager.cc',
           'threading/thread_id_name_manager.h',
           'threading/thread_local.h',
           'threading/thread_local_android.cc',
           'threading/thread_local_posix.cc',
           'threading/thread_local_storage.cc',
           'threading/thread_local_storage.h',
           'threading/thread_local_storage_posix.cc',
           'threading/thread_local_storage_win.cc',
           'threading/thread_local_win.cc',
+          'threading/thread_restrictions.cc',
           'threading/thread_restrictions.h',
-          'threading/thread_restrictions.cc',
           'threading/watchdog.cc',
           'threading/watchdog.h',
+          'threading/worker_pool.cc',
           'threading/worker_pool.h',
-          'threading/worker_pool.cc',
           'threading/worker_pool_posix.cc',
           'threading/worker_pool_posix.h',
           'threading/worker_pool_win.cc',
           'time/clock.cc',
           'time/clock.h',
           'time/default_clock.cc',
           'time/default_clock.h',
           'time/default_tick_clock.cc',
           'time/default_tick_clock.h',
           'time/tick_clock.cc',
           'time/tick_clock.h',
           'time/time.cc',
           'time/time.h',
           'time/time_mac.cc',
           'time/time_posix.cc',
           'time/time_win.cc',
           'timer/elapsed_timer.cc',
           'timer/elapsed_timer.h',
           'timer/hi_res_timer_manager.h',
           'timer/hi_res_timer_manager_posix.cc',
           'timer/hi_res_timer_manager_win.cc',
           'timer/mock_timer.cc',
           'timer/mock_timer.h',
           'timer/timer.cc',
           'timer/timer.h',
+          'trace_event/memory_dump_manager.cc',
+          'trace_event/memory_dump_manager.h',
+          'trace_event/memory_dump_provider.h',
+          'trace_event/process_memory_dump.cc',
+          'trace_event/process_memory_dump.h',
           'trace_event/trace_event.h',
           'trace_event/trace_event_android.cc',
           'trace_event/trace_event_argument.cc',
           'trace_event/trace_event_argument.h',
           'trace_event/trace_event_impl.cc',
           'trace_event/trace_event_impl.h',
           'trace_event/trace_event_impl_constants.cc',
           'trace_event/trace_event_memory.cc',
           'trace_event/trace_event_memory.h',
           'trace_event/trace_event_synthetic_delay.cc',
           'trace_event/trace_event_synthetic_delay.h',
           'trace_event/trace_event_system_stats_monitor.cc',
           'trace_event/trace_event_system_stats_monitor.h',
           'trace_event/trace_event_win.cc',
           'trace_event/trace_event_win.h',
           'tracked_objects.cc',
           'tracked_objects.h',
           'tracking_info.cc',
           'tracking_info.h',
           'tuple.h',
+          'value_conversions.cc',
+          'value_conversions.h',
           'values.cc',
           'values.h',
-          'value_conversions.cc',
-          'value_conversions.h',
           'version.cc',
           'version.h',
           'vlog.cc',
           'vlog.h',
           'win/enum_variant.cc',
           'win/enum_variant.h',
           'win/event_trace_consumer.h',
           'win/event_trace_controller.cc',
           'win/event_trace_controller.h',
           'win/event_trace_provider.cc',
@@ skipping 82 matching lines @@
                'files/file_enumerator_posix.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_proxy.cc',
                'files/file_util.cc',
                'files/file_util_posix.cc',
                'files/file_util_proxy.cc',
                'files/important_file_writer.cc',
+               'files/scoped_temp_dir.cc',
                'memory/shared_memory_posix.cc',
                'native_library_posix.cc',
                'path_service.cc',
                'posix/unix_domain_socket_linux.cc',
                'process/kill.cc',
                'process/kill_posix.cc',
                'process/launch.cc',
                'process/launch_posix.cc',
                'process/process_metrics.cc',
                'process/process_metrics_posix.cc',
                'process/process_posix.cc',
                'rand_util_posix.cc',
                'scoped_native_library.cc',
-               'files/scoped_temp_dir.cc',
                'sys_info.cc',
                'sys_info_posix.cc',
                'third_party/dynamic_annotations/dynamic_annotations.c',
             ],
             'sources/': [
               ['include', '^threading/platform_thread_linux\\.cc$'],
             ],
           }],
           ['OS == "android" and _toolset == "target" and >(nacl_untrusted_build)==0', {
            'sources': [
+             'memory/discardable_memory_ashmem.cc',
+             'memory/discardable_memory_ashmem.h',
              'memory/discardable_memory_ashmem_allocator.cc',
              'memory/discardable_memory_ashmem_allocator.h',
-             'memory/discardable_memory_ashmem.cc',
-             'memory/discardable_memory_ashmem.h',
            ],
           }],
           ['OS == "android" and >(nacl_untrusted_build)==0', {
             'sources!': [
               'base_paths_posix.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',
@@ skipping 204 matching lines @@
           'i18n/time_formatting.h',
           'i18n/timezone.cc',
           'i18n/timezone.h',
           'i18n/utf8_validator_tables.cc',
           'i18n/utf8_validator_tables.h',
         ],
       }]
     ],
   },
 }