Update from https://crrev.com/333737

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.
 
 {
   'includes': [
     'trace_event/trace_event.gypi',
   ],
   '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',
           'allocator/allocator_extension.cc',
           'allocator/allocator_extension.h',
           'allocator/type_profiler_control.cc',
           'allocator/type_profiler_control.h',
           'android/animation_frame_time_histogram.cc',
           'android/animation_frame_time_histogram.h',
+          'android/apk_assets.cc',
+          'android/apk_assets.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',
@@ skipping 86 matching lines @@
           'bits.h',
           'build_time.cc',
           'build_time.h',
           'callback.h',
           'callback_helpers.cc',
           'callback_helpers.h',
           'callback_internal.cc',
           'callback_internal.h',
           'callback_list.h',
           'cancelable_callback.h',
-          'chromeos/memory_pressure_monitor_chromeos.cc',
-          'chromeos/memory_pressure_monitor_chromeos.h',
           'command_line.cc',
           'command_line.h',
           'compiler_specific.h',
           'containers/adapters.h',
           'containers/hash_tables.h',
           'containers/linked_list.h',
           'containers/mru_cache.h',
           'containers/scoped_ptr_hash_map.h',
           'containers/small_map.h',
           'containers/stack_container.h',
@@ skipping 146 matching lines @@
           '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_util.h',
           'mac/mac_util.mm',
           'mac/mach_logging.cc',
           'mac/mach_logging.h',
-          'mac/memory_pressure_monitor_mac.cc',
-          'mac/memory_pressure_monitor_mac.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',
           'mac/scoped_block.h',
           'mac/scoped_cftyperef.h',
           'mac/scoped_ioobject.h',
           'mac/scoped_ioplugininterface.h',
@@ skipping 24 matching lines @@
           'memory/discardable_memory_allocator.cc',
           'memory/discardable_memory_allocator.h',
           'memory/discardable_shared_memory.cc',
           'memory/discardable_shared_memory.h',
           'memory/linked_ptr.h',
           'memory/manual_constructor.h',
           'memory/memory_pressure_listener.cc',
           'memory/memory_pressure_listener.h',
           'memory/memory_pressure_monitor.cc',
           'memory/memory_pressure_monitor.h',
+          'memory/memory_pressure_monitor_chromeos.cc',
+          'memory/memory_pressure_monitor_chromeos.h',
+          'memory/memory_pressure_monitor_mac.cc',
+          'memory/memory_pressure_monitor_mac.h',
+          'memory/memory_pressure_monitor_win.cc',
+          'memory/memory_pressure_monitor_win.h',
           'memory/raw_scoped_refptr_mismatch_checker.h',
           'memory/ref_counted.cc',
           'memory/ref_counted.h',
           'memory/ref_counted_delete_on_message_loop.h',
           'memory/ref_counted_memory.cc',
           'memory/ref_counted_memory.h',
           'memory/scoped_policy.h',
           'memory/scoped_ptr.h',
           'memory/scoped_vector.h',
           'memory/shared_memory.h',
@@ skipping 70 matching lines @@
           '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/safe_strerror.cc',
+          'posix/safe_strerror.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_ios.mm',
@@ skipping 33 matching lines @@
           '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_mac.cc',
           'process/process_metrics.cc',
           'process/process_metrics.h',
           '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',
@@ skipping 12 matching lines @@
           'profiler/stack_sampling_profiler_win.cc',
           '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',
-          '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',
@@ skipping 170 matching lines @@
           'win/event_trace_controller.cc',
           'win/event_trace_controller.h',
           'win/event_trace_provider.cc',
           'win/event_trace_provider.h',
           'win/i18n.cc',
           'win/i18n.h',
           'win/iat_patch_function.cc',
           'win/iat_patch_function.h',
           'win/iunknown_impl.cc',
           'win/iunknown_impl.h',
-          'win/memory_pressure_monitor.cc',
-          'win/memory_pressure_monitor.h',
           'win/message_window.cc',
           'win/message_window.h',
           'win/metro.cc',
           'win/metro.h',
           'win/object_watcher.cc',
           'win/object_watcher.h',
           'win/registry.cc',
           'win/registry.h',
           'win/resource_util.cc',
           'win/resource_util.h',
@@ skipping 302 matching lines @@
           'i18n/time_formatting.h',
           'i18n/timezone.cc',
           'i18n/timezone.h',
           'i18n/utf8_validator_tables.cc',
           'i18n/utf8_validator_tables.h',
         ],
       }]
     ],
   },
 }