Chromium -> Mojo roll.

base/base.gypi

Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 13cba85da1693ba18a59fd5efa877aff100ddbaf..825bca1faf4ab38caeaed17cf9f5888e4c47122a 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -3,6 +3,9 @@
 # found in the LICENSE file.
 
 {
+  'includes': [
+    'trace_event/trace_event.gypi',
+  ],
   'target_defaults': {
     'variables': {
       'base_target': 0,
@@ -318,10 +321,8 @@
           'memory/aligned_memory.h',
           'memory/discardable_memory.cc',
           'memory/discardable_memory.h',
-          'memory/discardable_memory_shmem.cc',
-          'memory/discardable_memory_shmem.h',
-          'memory/discardable_memory_shmem_allocator.cc',
-          'memory/discardable_memory_shmem_allocator.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',
@@ -487,6 +488,10 @@
           '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',
           'rand_util.cc',
@@ -602,6 +607,8 @@
           'threading/non_thread_safe_impl.h',
           'threading/platform_thread.h',
           'threading/platform_thread_android.cc',
+          'threading/platform_thread_internal_posix.cc',
+          'threading/platform_thread_internal_posix.h',
           'threading/platform_thread_linux.cc',
           'threading/platform_thread_mac.mm',
           'threading/platform_thread_posix.cc',
@@ -660,34 +667,6 @@
           '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',
-          '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',
@@ -750,6 +729,7 @@
           'win/windows_version.h',
           'win/wrapped_window_proc.cc',
           'win/wrapped_window_proc.h',
+          '<@(trace_event_sources)',
         ],
         'defines': [
           'BASE_IMPLEMENTATION',
@@ -896,6 +876,7 @@
               ['include', '^process/.*_ios\.(cc|mm)$'],
               ['include', '^process/memory_stubs\.cc$'],
               ['include', '^process/process_handle_posix\.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'],
@@ -963,10 +944,11 @@
           }],
           ['(OS == "mac" or OS == "ios") and >(nacl_untrusted_build)==0', {
             'sources/': [
-              ['exclude', '^files/file_path_watcher_stub\\.cc$'],
               ['exclude', '^base_paths_posix\\.cc$'],
+              ['exclude', '^files/file_path_watcher_stub\\.cc$'],
               ['exclude', '^native_library_posix\\.cc$'],
               ['exclude', '^strings/sys_string_conversions_posix\\.cc$'],
+              ['exclude', '^threading/platform_thread_internal_posix\\.cc$'],
             ],
           }],
           ['<(os_bsd)==1 and >(nacl_untrusted_build)==0', {