Update from https://crrev.com/316786

base/BUILD.gn

 # Copyright (c) 2013 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.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
 component("base") {
   sources = [
-    "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/superfasthash/superfasthash.c",
     "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",
@@ skipping 57 matching lines @@
     "atomicops.h",
     "atomicops_internals_gcc.h",
     "atomicops_internals_mac.h",
     "atomicops_internals_portable.h",
     "atomicops_internals_x86_gcc.cc",
     "atomicops_internals_x86_gcc.h",
     "atomicops_internals_x86_msvc.h",
     "auto_reset.h",
     "barrier_closure.cc",
     "barrier_closure.h",
+    "base64.cc",
+    "base64.h",
     "base_export.h",
     "base_paths.cc",
     "base_paths.h",
     "base_paths_android.cc",
     "base_paths_android.h",
     "base_paths_mac.h",
     "base_paths_mac.mm",
     "base_paths_posix.cc",
     "base_paths_posix.h",
     "base_paths_win.cc",
     "base_paths_win.h",
     "base_switches.h",
-    "base64.cc",
-    "base64.h",
     "basictypes.h",
     "big_endian.cc",
     "big_endian.h",
     "bind.h",
     "bind_helpers.cc",
     "bind_helpers.h",
     "bind_internal.h",
     "bind_internal_win.h",
     "bits.h",
     "build_time.cc",
     "build_time.h",
     "callback.h",
     "callback_helpers.cc",
     "callback_helpers.h",
     "callback_internal.cc",
     "callback_internal.h",
     "cancelable_callback.h",
+    "chromeos/memory_pressure_observer_chromeos.cc",
+    "chromeos/memory_pressure_observer_chromeos.h",
     "command_line.cc",
     "command_line.h",
-    "chromeos/memory_pressure_observer_chromeos.cc",
-    "chromeos/memory_pressure_observer_chromeos.h",
     "compiler_specific.h",
     "containers/adapters.h",
     "containers/hash_tables.h",
     "containers/linked_list.h",
     "containers/mru_cache.h",
     "containers/small_map.h",
     "containers/stack_container.h",
     "cpu.cc",
     "cpu.h",
     "critical_closure.h",
     "critical_closure_internal_ios.mm",
     "debug/alias.cc",
     "debug/alias.h",
     "debug/asan_invalid_access.cc",
     "debug/asan_invalid_access.h",
     "debug/crash_logging.cc",
     "debug/crash_logging.h",
     "debug/debugger.cc",
     "debug/debugger.h",
     "debug/debugger_posix.cc",
     "debug/debugger_win.cc",
     "debug/dump_without_crashing.cc",
     "debug/dump_without_crashing.h",
     "debug/gdi_debug_util_win.cc",
     "debug/gdi_debug_util_win.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/superfasthash/superfasthash.c",
 
     # This file depends on files from the "allocator" target,
     # but this target does not depend on "allocator" (see
     # allocator.gyp for details).
     "debug/leak_annotations.h",
     "debug/leak_tracker.h",
     "debug/proc_maps_linux.cc",
     "debug/proc_maps_linux.h",
     "debug/profiler.cc",
     "debug/profiler.h",
@@ skipping 11 matching lines @@
     "file_descriptor_posix.h",
     "file_version_info.h",
     "file_version_info_mac.h",
     "file_version_info_mac.mm",
     "file_version_info_win.cc",
     "file_version_info_win.h",
     "files/dir_reader_fallback.h",
     "files/dir_reader_linux.h",
     "files/dir_reader_posix.h",
     "files/file.cc",
-    "files/file_posix.cc",
-    "files/file_win.cc",
     "files/file_enumerator.cc",
     "files/file_enumerator.h",
     "files/file_enumerator_posix.cc",
     "files/file_enumerator_win.cc",
     "files/file_path.cc",
     "files/file_path.h",
     "files/file_path_constants.cc",
     "files/file_path_watcher.cc",
     "files/file_path_watcher.h",
     "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_linux.cc",
     "files/file_path_watcher_mac.cc",
     "files/file_path_watcher_win.cc",
+    "files/file_posix.cc",
     "files/file_proxy.cc",
     "files/file_proxy.h",
     "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/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",
@@ skipping 46 matching lines @@
     "mac/bundle_locations.mm",
     "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 76 matching lines @@
     "message_loop/message_pump_glib.cc",
     "message_loop/message_pump_glib.h",
     "message_loop/message_pump_io_ios.cc",
     "message_loop/message_pump_io_ios.h",
     "message_loop/message_pump_libevent.cc",
     "message_loop/message_pump_libevent.h",
     "message_loop/message_pump_mac.h",
     "message_loop/message_pump_mac.mm",
     "message_loop/message_pump_win.cc",
     "message_loop/message_pump_win.h",
+    "metrics/bucket_ranges.cc",
+    "metrics/bucket_ranges.h",
     "metrics/field_trial.cc",
     "metrics/field_trial.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/sample_map.cc",
+    "metrics/sample_map.h",
+    "metrics/sample_vector.cc",
+    "metrics/sample_vector.h",
     "metrics/histogram_delta_serialization.",
     "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/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",
-    "nix/mime_util_xdg.cc",
-    "nix/mime_util_xdg.h",
-    "nix/xdg_util.cc",
-    "nix/xdg_util.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",
@@ skipping 102 matching lines @@
     "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 21 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_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",
     "thread_task_runner_handle.cc",
     "thread_task_runner_handle.h",
     "threading/non_thread_safe.h",
     "threading/non_thread_safe_impl.cc",
@@ skipping 20 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 68 matching lines @@
   ]
 
   # Allow more direct string conversions on platforms with native utf8
   # strings
   if (is_mac || is_ios || is_chromeos) {
     defines += [ "SYSTEM_NATIVE_UTF8" ]
   }
 
   if (is_android) {
     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",
     ]
     sources -= [
       "base_paths_posix.cc",
       "power_monitor/power_monitor_device_source_posix.cc",
     ]
 
     # Android uses some Linux sources, put those back.
     set_sources_assignment_filter([])
     sources += [
       "debug/proc_maps_linux.cc",
       "files/file_path_watcher_linux.cc",
+      "posix/unix_domain_socket_linux.cc",
+      "process/internal_linux.cc",
       "process/memory_linux.cc",
-      "process/internal_linux.cc",
       "process/process_handle_linux.cc",
       "process/process_iterator_linux.cc",
       "process/process_metrics_linux.cc",
-      "posix/unix_domain_socket_linux.cc",
       "sys_info_linux.cc",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
 
     deps += [
       ":base_jni_headers",
       "//third_party/ashmem",
       "//third_party/android_tools:cpu_features",
     ]
 
     # logging.cc uses the Android logging library.
     libs = [ "log" ]
 
     sources -= [ "debug/stack_trace_posix.cc" ]
   }
 
   if (is_chromeos) {
     sources -= [ "power_monitor/power_monitor_device_source_posix.cc" ]
   }
 
   if (is_nacl) {
     # These things would otherwise be built on a Posix build but aren't
     # supported on NaCl.
     sources -= [
       "debug/stack_trace_posix.cc",
       "files/file_enumerator_posix.cc",
       "files/file_util_posix.cc",
+      "memory/shared_memory_posix.cc",
       "message_loop/message_pump_libevent.cc",
+      "metrics/field_trial.cc",
+      "native_library_posix.cc",
       "process/kill_posix.cc",
       "process/launch_posix.cc",
       "process/process_metrics_posix.cc",
       "process/process_posix.cc",
-      "metrics/field_trial.cc",
-      "native_library_posix.cc",
-      "memory/shared_memory_posix.cc",
       "sync_socket_posix.cc",
       "sys_info_posix.cc",
     ]
   } else {
     # Remove nacl stuff.
     sources -= [
+      "memory/shared_memory_nacl.cc",
       "os_compat_nacl.cc",
       "os_compat_nacl.h",
       "rand_util_nacl.cc",
-      "memory/shared_memory_nacl.cc",
     ]
   }
 
   # Windows.
   if (is_win) {
     sources -= [
       "message_loop/message_pump_libevent.cc",
       "strings/string16.cc",
 
       # Not using sha1_win.cc because it may have caused a
@@ skipping 253 matching lines @@
     ":base",
     "//testing/gtest",
   ]
 }
 
 # TODO(pasko): Remove this target when crbug.com/424562 is fixed.
 source_set("protect_file_posix") {
   sources = [
     "files/protect_file_posix.cc",
   ]
+
+  deps = [
+    "//base",
+  ]
 }
 
 test("base_unittests") {
   sources = [
     "android/application_status_listener_unittest.cc",
     "android/content_uri_utils_unittest.cc",
     "android/jni_android_unittest.cc",
     "android/jni_array_unittest.cc",
     "android/jni_string_unittest.cc",
     "android/path_utils_unittest.cc",
@@ skipping 37 matching lines @@
     "files/file_path_unittest.cc",
     "files/file_proxy_unittest.cc",
     "files/file_unittest.cc",
     "files/file_util_proxy_unittest.cc",
     "files/file_util_unittest.cc",
     "files/important_file_writer_unittest.cc",
     "files/scoped_temp_dir_unittest.cc",
     "gmock_unittest.cc",
     "guid_unittest.cc",
     "hash_unittest.cc",
-    "id_map_unittest.cc",
     "i18n/break_iterator_unittest.cc",
+    "i18n/case_conversion_unittest.cc",
     "i18n/char_iterator_unittest.cc",
-    "i18n/case_conversion_unittest.cc",
     "i18n/file_util_icu_unittest.cc",
     "i18n/icu_string_conversions_unittest.cc",
     "i18n/number_formatting_unittest.cc",
     "i18n/rtl_unittest.cc",
     "i18n/streaming_utf8_validator_unittest.cc",
     "i18n/string_search_unittest.cc",
     "i18n/time_formatting_unittest.cc",
     "i18n/timezone_unittest.cc",
+    "id_map_unittest.cc",
     "ios/device_util_unittest.mm",
     "ios/weak_nsobject_unittest.mm",
     "json/json_parser_unittest.cc",
     "json/json_reader_unittest.cc",
     "json/json_value_converter_unittest.cc",
     "json/json_value_serializer_unittest.cc",
     "json/json_writer_unittest.cc",
     "json/string_escape_unittest.cc",
     "lazy_instance_unittest.cc",
     "logging_unittest.cc",
@@ skipping 18 matching lines @@
     "memory/scoped_vector_unittest.cc",
     "memory/shared_memory_unittest.cc",
     "memory/singleton_unittest.cc",
     "memory/weak_ptr_unittest.cc",
     "memory/weak_ptr_unittest.nc",
     "message_loop/message_loop_proxy_impl_unittest.cc",
     "message_loop/message_loop_proxy_unittest.cc",
     "message_loop/message_loop_unittest.cc",
     "message_loop/message_pump_glib_unittest.cc",
     "message_loop/message_pump_io_ios_unittest.cc",
-    "metrics/sample_map_unittest.cc",
-    "metrics/sample_vector_unittest.cc",
     "metrics/bucket_ranges_unittest.cc",
     "metrics/field_trial_unittest.cc",
     "metrics/histogram_base_unittest.cc",
     "metrics/histogram_delta_serialization_unittest.cc",
     "metrics/histogram_snapshot_manager_unittest.cc",
     "metrics/histogram_unittest.cc",
+    "metrics/sample_map_unittest.cc",
+    "metrics/sample_vector_unittest.cc",
     "metrics/sparse_histogram_unittest.cc",
-    "metrics/stats_table_unittest.cc",
     "metrics/statistics_recorder_unittest.cc",
+    "numerics/safe_numerics_unittest.cc",
     "observer_list_unittest.cc",
     "os_compat_android_unittest.cc",
     "path_service_unittest.cc",
     "pickle_unittest.cc",
     "posix/file_descriptor_shuffle_unittest.cc",
     "posix/unix_domain_socket_linux_unittest.cc",
     "power_monitor/power_monitor_unittest.cc",
     "prefs/default_pref_store_unittest.cc",
     "prefs/json_pref_store_unittest.cc",
     "prefs/overlay_user_pref_store_unittest.cc",
     "prefs/pref_change_registrar_unittest.cc",
     "prefs/pref_member_unittest.cc",
     "prefs/pref_notifier_impl_unittest.cc",
     "prefs/pref_service_unittest.cc",
     "prefs/pref_value_map_unittest.cc",
     "prefs/pref_value_store_unittest.cc",
     "prefs/scoped_user_pref_update_unittest.cc",
     "process/memory_unittest.cc",
     "process/memory_unittest_mac.h",
     "process/memory_unittest_mac.mm",
     "process/process_metrics_unittest.cc",
     "process/process_metrics_unittest_ios.cc",
     "process/process_unittest.cc",
     "process/process_util_unittest.cc",
     "process/process_util_unittest_ios.cc",
     "profiler/tracked_time_unittest.cc",
     "rand_util_unittest.cc",
-    "numerics/safe_numerics_unittest.cc",
     "scoped_clear_errno_unittest.cc",
     "scoped_generic_unittest.cc",
     "scoped_native_library_unittest.cc",
     "security_unittest.cc",
     "sequence_checker_unittest.cc",
     "sha1_unittest.cc",
     "stl_util_unittest.cc",
     "strings/nullable_string16_unittest.cc",
     "strings/safe_sprintf_unittest.cc",
     "strings/string16_unittest.cc",
-    "strings/stringprintf_unittest.cc",
     "strings/string_number_conversions_unittest.cc",
     "strings/string_piece_unittest.cc",
     "strings/string_split_unittest.cc",
     "strings/string_tokenizer_unittest.cc",
     "strings/string_util_unittest.cc",
     "strings/stringize_macros_unittest.cc",
+    "strings/stringprintf_unittest.cc",
     "strings/sys_string_conversions_mac_unittest.mm",
     "strings/sys_string_conversions_unittest.cc",
     "strings/utf_offset_string_conversions_unittest.cc",
     "strings/utf_string_conversions_unittest.cc",
     "supports_user_data_unittest.cc",
     "sync_socket_unittest.cc",
     "synchronization/cancellation_flag_unittest.cc",
     "synchronization/condition_variable_unittest.cc",
     "synchronization/lock_unittest.cc",
     "synchronization/waitable_event_unittest.cc",
@@ skipping 21 matching lines @@
     "threading/watchdog_unittest.cc",
     "threading/worker_pool_posix_unittest.cc",
     "threading/worker_pool_unittest.cc",
     "time/pr_time_unittest.cc",
     "time/time_unittest.cc",
     "time/time_win_unittest.cc",
     "timer/hi_res_timer_manager_unittest.cc",
     "timer/mock_timer_unittest.cc",
     "timer/timer_unittest.cc",
     "tools_sanity_unittest.cc",
+    "trace_event/memory_dump_manager_unittest.cc",
     "trace_event/trace_event_argument_unittest.cc",
     "trace_event/trace_event_memory_unittest.cc",
     "trace_event/trace_event_synthetic_delay_unittest.cc",
     "trace_event/trace_event_system_stats_monitor_unittest.cc",
     "trace_event/trace_event_unittest.cc",
     "trace_event/trace_event_win_unittest.cc",
     "tracked_objects_unittest.cc",
     "tuple_unittest.cc",
     "values_unittest.cc",
     "version_unittest.cc",
@@ skipping 22 matching lines @@
   deps = [
     ":base",
     ":i18n",
     ":message_loop_tests",
     ":prefs",
     ":prefs_test_support",
     "//base/allocator",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
     "//base/third_party/dynamic_annotations",
+    "//base/third_party/nspr",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/icu",
   ]
 
   if (is_android) {
     apk_deps = [
       ":base_java",
       ":base_java_unittest_support",
     ]
   }
 
   if (is_ios) {
     sources -= [
-      "metrics/stats_table_uinittest.cc",  # Requires spawning a process.
       "process/memory_unittest.cc",
       "process/memory_unittest_mac.h",
       "process/memory_unittest_mac.mm",
       "process/process_unittest.cc",
       "process/process_util_unittest.cc",
     ]
 
     # Pull in specific Mac files for iOS (which have been filtered out by file
     # name rules).
     set_sources_assignment_filter([])
@@ skipping 102 matching lines @@
   # GYP: //base.gyp:base_java_test_support
   android_library("base_java_test_support") {
     deps = [
       ":base_java",
     ]
     DEPRECATED_java_in_dir = "test/android/javatests/src"
   }
 
   # GYP: //base.gyp:base_java_application_state
   # GYP: //base.gyp:base_java_library_load_from_apk_status_codes
+  # GYP: //base.gyp:base_java_library_process_type
   # GYP: //base.gyp:base_java_memory_pressure_level
   java_cpp_enum("base_android_java_enums_srcjar") {
     sources = [
       "android/application_status_listener.h",
       "android/library_loader/library_load_from_apk_status_codes.h",
+      "android/library_loader/library_loader_hooks.h",
       "memory/memory_pressure_listener.h",
     ]
     outputs = [
       "org/chromium/base/ApplicationState.java",
       "org/chromium/base/library_loader/LibraryLoadFromApkStatusCodes.java",
+      "org/chromium/base/library_loader/LibraryProcessType.java",
       "org/chromium/base/MemoryPressureLevel.java",
     ]
   }
 
   # GYP: //base/base.gyp:base_native_libraries_gen
   java_cpp_template("base_native_libraries_gen") {
     sources = [
       "android/java/templates/NativeLibraries.template",
     ]
     package_name = "org/chromium/base/library_loader"
   }
 
   # GYP: //base.gyp:base_java_unittest_support
   android_library("base_java_unittest_support") {
     deps = [
       ":base_java",
     ]
     java_files =
         [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
   }
 }