Update from https://crrev.com/318214

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")
 }
@@ skipping 292 matching lines @@
     "mac/scoped_nsautorelease_pool.h",
     "mac/scoped_nsautorelease_pool.mm",
     "mac/scoped_nsexception_enabler.h",
     "mac/scoped_nsexception_enabler.mm",
     "mac/scoped_nsobject.h",
     "mac/scoped_objc_class_swizzler.h",
     "mac/scoped_objc_class_swizzler.mm",
     "mac/scoped_sending_event.h",
     "mac/scoped_sending_event.mm",
     "mac/sdk_forward_declarations.h",
+    "mac/sdk_forward_declarations.mm",
     "macros.h",
     "md5.cc",
     "md5.h",
     "memory/aligned_memory.cc",
     "memory/aligned_memory.h",
     "memory/discardable_memory.cc",
     "memory/discardable_memory.h",
     "memory/discardable_memory_android.cc",
     "memory/discardable_memory_emulated.cc",
     "memory/discardable_memory_emulated.h",
@@ skipping 345 matching lines @@
     "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/process_memory_maps.cc",
+    "trace_event/process_memory_maps.h",
+    "trace_event/process_memory_maps_dump_provider.cc",
+    "trace_event/process_memory_maps_dump_provider.h",
     "trace_event/process_memory_totals.cc",
     "trace_event/process_memory_totals.h",
     "trace_event/process_memory_totals_dump_provider.cc",
     "trace_event/process_memory_totals_dump_provider.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",
@@ skipping 64 matching lines @@
     "win/startup_information.h",
     "win/win_util.cc",
     "win/win_util.h",
     "win/windows_version.cc",
     "win/windows_version.h",
     "win/wrapped_window_proc.cc",
     "win/wrapped_window_proc.h",
   ]
 
   if (is_nacl) {
-    sources += [ "files/file_path_watcher_stub.cc" ]
+    # We reset sources_assignment_filter in order to explicitly include
+    # the linux file (which would otherwise be filtered out).
+    set_sources_assignment_filter([])
+    sources += [
+      "files/file_path_watcher_stub.cc",
+      "sync_socket_nacl.cc",
+      "threading/platform_thread_linux.cc",
+    ]
+    set_sources_assignment_filter(sources_assignment_filter)
+
+    sources -= [
+      "allocator/type_profiler_control.cc",
+      "allocator/type_profiler_control.h",
+      "async_socket_io_handler_posix.cc",
+      "base_paths.cc",
+      "cpu.cc",
+      "files/file_proxy.cc",
+      "files/file_util.cc",
+      "files/file_util_proxy.cc",
+      "path_service.cc",
+      "scoped_native_library.cc",
+      "files/scoped_temp_dir.cc",
+    ]
   }
 
   sources -= [
     "process/process_handle_freebsd.cc",
     "process/process_handle_openbsd.cc",
     "process/process_iterator_freebsd.cc",
     "process/process_iterator_openbsd.cc",
     "process/process_metrics_freebsd.cc",
     "process/process_metrics_openbsd.cc",
     "sys_info_freebsd.cc",
@@ skipping 67 matching lines @@
       "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",
+      "rand_util_posix.cc",
       "sync_socket_posix.cc",
       "sys_info_posix.cc",
     ]
   } else {
-    # Remove nacl stuff.
+    # Remove NaCl stuff.
     sources -= [
       "memory/shared_memory_nacl.cc",
       "os_compat_nacl.cc",
       "os_compat_nacl.h",
       "rand_util_nacl.cc",
     ]
   }
 
   # Windows.
   if (is_win) {
@@ skipping 262 matching lines @@
 source_set("protect_file_posix") {
   sources = [
     "files/protect_file_posix.cc",
   ]
 
   deps = [
     "//base",
   ]
 }
 
+if (is_win) {
+  shared_library("pe_image_test") {
+    sources = [
+      "win/pe_image_test.cc",
+    ]
+    ldflags = [
+      "/DELAYLOAD:cfgmgr32.dll",
+      "/DELAYLOAD:shell32.dll",
+      "/SUBSYSTEM:WINDOWS",
+    ]
+    libs = [
+      "cfgmgr32.lib",
+      "shell32.lib",
+    ]
+  }
+}
+
 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",
     "android/scoped_java_ref_unittest.cc",
     "android/sys_utils_unittest.cc",
@@ skipping 182 matching lines @@
     "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/process_memory_maps_dump_provider_unittest.cc",
     "trace_event/process_memory_totals_dump_provider_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",
@@ skipping 85 matching lines @@
     deps += [ "//third_party/libevent" ]
   }
 
   if (is_android) {
     deps += [ "//testing/android:native_test_native_code" ]
     set_sources_assignment_filter([])
     sources += [ "debug/proc_maps_linux_unittest.cc" ]
     set_sources_assignment_filter(sources_assignment_filter)
   }
 
+  if (is_win) {
+    deps += [ ":pe_image_test" ]
+  }
+
   # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 }
 
 if (is_android) {
   # GYP: //base.gyp:base_jni_headers
   generate_jni("base_jni_headers") {
     sources = [
       "android/java/src/org/chromium/base/ApplicationStatus.java",
       "android/java/src/org/chromium/base/BuildInfo.java",
@@ skipping 87 matching lines @@
 
   # 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" ]
   }
 }