Update from https://crrev.com/327068

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': {
@@ skipping 27 matching lines @@
           '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/java_handler_thread.cc',
           'android/java_handler_thread.h',
+          'android/java_runtime.cc',
+          'android/java_runtime.h',
           'android/jni_android.cc',
           'android/jni_android.h',
           'android/jni_array.cc',
           'android/jni_array.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/locale_utils.cc',
           'android/locale_utils.h',
           'android/memory_pressure_listener_android.cc',
           'android/memory_pressure_listener_android.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/record_user_action.cc',
+          'android/record_user_action.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',
@@ skipping 32 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_observer_chromeos.cc',
-          'chromeos/memory_pressure_observer_chromeos.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 79 matching lines @@
           'files/important_file_writer.cc',
           'files/important_file_writer.h',
           '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',
@@ skipping 85 matching lines @@
           'memory/discardable_memory.cc',
           'memory/discardable_memory.h',
           '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/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 42 matching lines @@
           'metrics/sample_vector.h',
           'metrics/sparse_histogram.cc',
           'metrics/sparse_histogram.h',
           'metrics/statistics_recorder.cc',
           'metrics/statistics_recorder.h',
           'metrics/user_metrics.cc',
           'metrics/user_metrics.h',
           'metrics/user_metrics_action.h',
           'move.h',
           'native_library.h',
+          'native_library_ios.mm',
           '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',
@@ skipping 73 matching lines @@
           '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/native_stack_sampler.cc',
+          'profiler/native_stack_sampler.h',
           'profiler/scoped_profile.cc',
           'profiler/scoped_profile.h',
           'profiler/scoped_tracker.cc',
           'profiler/scoped_tracker.h',
           'profiler/stack_sampling_profiler.cc',
           'profiler/stack_sampling_profiler.h',
           'profiler/stack_sampling_profiler_posix.cc',
           'profiler/stack_sampling_profiler_win.cc',
           'profiler/tracked_time.cc',
           'profiler/tracked_time.h',
@@ skipping 332 matching lines @@
           ['OS == "android" and _toolset == "host" and host_os == "linux"', {
             'defines': [
               'OS_ANDROID_HOST=Linux',
             ],
             'sources/': [
               # Pull in specific files for host builds.
               ['include', '^atomicops_internals_x86_gcc\\.cc$'],
               ['include', '^threading/platform_thread_linux\\.cc$'],
             ],
           }],
-          ['OS == "android" and <(android_webview_build)==1', {
-            'defines': [
-               # WebView builds as part of the system which already has sincos;
-               # avoid defining it again as it causes a linker warning.
-               'ANDROID_SINCOS_PROVIDED',
-            ],
-          }],
           ['<(chromeos) == 1', {
             'sources!': [
               'power_monitor/power_monitor_device_source_posix.cc',
             ],
           }],
           ['OS == "ios" and _toolset != "host"', {
             'sources/': [
               # Pull in specific Mac files for iOS (which have been filtered out
               # by file name rules).
               ['include', '^atomicops_internals_mac\\.'],
@@ skipping 13 matching lines @@
               ['include', '^strings/sys_string_conversions_mac\\.'],
               ['include', '^threading/platform_thread_mac\\.'],
               ['include', '^time/time_mac\\.'],
               ['include', '^worker_pool_mac\\.'],
               # Exclude all process/ except the minimal implementation
               # needed on iOS (mostly for unit tests).
               ['exclude', '^process/.*'],
               ['include', '^process/.*_ios\.(cc|mm)$'],
               ['include', '^process/memory_stubs\.cc$'],
               ['include', '^process/process_handle_posix\.cc$'],
+              ['include', '^process/process_metrics\\.cc$'],
               ['exclude', '^threading/platform_thread_internal_posix\\.(h|cc)'],
               ['exclude', 'files/file_path_watcher_fsevents.cc'],
               ['exclude', 'files/file_path_watcher_fsevents.h'],
               ['include', 'files/file_path_watcher_mac.cc'],
             ],
             'sources': [
               'process/memory_stubs.cc',
             ],
             'sources!': [
               'message_loop/message_pump_libevent.cc'
@@ skipping 124 matching lines @@
           'i18n/time_formatting.h',
           'i18n/timezone.cc',
           'i18n/timezone.h',
           'i18n/utf8_validator_tables.cc',
           'i18n/utf8_validator_tables.h',
         ],
       }]
     ],
   },
 }