Update from https://crrev.com/327068

base/base.gypi

Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 825bca1faf4ab38caeaed17cf9f5888e4c47122a..bbc3f60fb5ade6279cf637eefc2e39c533ef1c33 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -45,6 +45,8 @@
           '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',
@@ -70,6 +72,8 @@
           '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',
@@ -122,8 +126,8 @@
           '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',
@@ -223,7 +227,6 @@
           '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',
@@ -329,6 +332,8 @@
           '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',
@@ -391,6 +396,7 @@
           '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',
@@ -484,6 +490,8 @@
           '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',
@@ -836,13 +844,6 @@
               ['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',
@@ -876,6 +877,7 @@
               ['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'],