Roll Chrome into Mojo.

base/BUILD.gn

Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index e20b744be50e4472a7d6a6b33c7f60e466fc804c..b31fed150b73c1a0c2e13d30767ba2a176d7bb75 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -169,19 +169,10 @@ component("base") {
     "debug/task_annotator.cc",
     "debug/task_annotator.h",
     "debug/trace_event.h",
-    "debug/trace_event_android.cc",
-    "debug/trace_event_argument.cc",
     "debug/trace_event_argument.h",
-    "debug/trace_event_impl.cc",
     "debug/trace_event_impl.h",
-    "debug/trace_event_impl_constants.cc",
-    "debug/trace_event_memory.cc",
-    "debug/trace_event_memory.h",
-    "debug/trace_event_synthetic_delay.cc",
     "debug/trace_event_synthetic_delay.h",
-    "debug/trace_event_system_stats_monitor.cc",
-    "debug/trace_event_system_stats_monitor.h",
-    "debug/trace_event_win.cc",
+    "debug/trace_event_win.h",
     "deferred_sequenced_task_runner.cc",
     "deferred_sequenced_task_runner.h",
     "environment.cc",
@@ -687,6 +678,21 @@ component("base") {
     "timer/mock_timer.h",
     "timer/timer.cc",
     "timer/timer.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",
@@ -1167,13 +1173,6 @@ test("base_unittests") {
     "debug/proc_maps_linux_unittest.cc",
     "debug/stack_trace_unittest.cc",
     "debug/task_annotator_unittest.cc",
-    "debug/trace_event_argument_unittest.cc",
-    "debug/trace_event_memory_unittest.cc",
-    "debug/trace_event_synthetic_delay_unittest.cc",
-    "debug/trace_event_system_stats_monitor_unittest.cc",
-    "debug/trace_event_unittest.cc",
-    "debug/trace_event_unittest.h",
-    "debug/trace_event_win_unittest.cc",
     "deferred_sequenced_task_runner_unittest.cc",
     "environment_unittest.cc",
     "file_version_info_unittest.cc",
@@ -1335,6 +1334,12 @@ test("base_unittests") {
     "timer/mock_timer_unittest.cc",
     "timer/timer_unittest.cc",
     "tools_sanity_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",