Update from https://crrev.com/320931

cc/BUILD.gn

Index: cc/BUILD.gn
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 4ee07db6b1419b01cfa45db7ad13e323f9b79d6f..ad33651ac260d655601702639473d9b78f248b4a 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -38,39 +38,6 @@ component("cc") {
     "animation/transform_operation.h",
     "animation/transform_operations.cc",
     "animation/transform_operations.h",
-    "base/completion_event.h",
-    "base/delayed_unique_notifier.cc",
-    "base/delayed_unique_notifier.h",
-    "base/invalidation_region.cc",
-    "base/invalidation_region.h",
-    "base/latency_info_swap_promise.cc",
-    "base/latency_info_swap_promise.h",
-    "base/latency_info_swap_promise_monitor.cc",
-    "base/latency_info_swap_promise_monitor.h",
-    "base/math_util.cc",
-    "base/math_util.h",
-    "base/ref_counted_managed.h",
-    "base/region.cc",
-    "base/region.h",
-    "base/rolling_time_delta_history.cc",
-    "base/rolling_time_delta_history.h",
-    "base/scoped_ptr_algorithm.h",
-    "base/scoped_ptr_deque.h",
-    "base/scoped_ptr_vector.h",
-    "base/simple_enclosed_region.cc",
-    "base/simple_enclosed_region.h",
-    "base/swap_promise.h",
-    "base/swap_promise_monitor.cc",
-    "base/swap_promise_monitor.h",
-    "base/switches.cc",
-    "base/switches.h",
-    "base/synced_property.h",
-    "base/tiling_data.cc",
-    "base/tiling_data.h",
-    "base/time_util.h",
-    "base/unique_notifier.cc",
-    "base/unique_notifier.h",
-    "base/util.h",
     "debug/benchmark_instrumentation.cc",
     "debug/benchmark_instrumentation.h",
     "debug/debug_colors.cc",
@@ -260,6 +227,8 @@ component("cc") {
     "output/gl_renderer.h",
     "output/gl_renderer_draw_cache.cc",
     "output/gl_renderer_draw_cache.h",
+    "output/latency_info_swap_promise.cc",
+    "output/latency_info_swap_promise.h",
     "output/managed_memory_policy.cc",
     "output/managed_memory_policy.h",
     "output/output_surface.cc",
@@ -278,6 +247,8 @@ component("cc") {
     "output/render_surface_filters.h",
     "output/renderer.cc",
     "output/renderer.h",
+    "output/renderer_capabilities.cc",
+    "output/renderer_capabilities.h",
     "output/renderer_settings.cc",
     "output/renderer_settings.h",
     "output/shader.cc",
@@ -290,6 +261,7 @@ component("cc") {
     "output/software_renderer.h",
     "output/static_geometry_binding.cc",
     "output/static_geometry_binding.h",
+    "output/swap_promise.h",
     "output/viewport_selection_bound.cc",
     "output/viewport_selection_bound.h",
     "output/vsync_parameter_observer.h",
@@ -499,6 +471,8 @@ component("cc") {
     "trees/damage_tracker.h",
     "trees/draw_property_utils.cc",
     "trees/draw_property_utils.h",
+    "trees/latency_info_swap_promise_monitor.cc",
+    "trees/latency_info_swap_promise_monitor.h",
     "trees/layer_tree_host.cc",
     "trees/layer_tree_host.h",
     "trees/layer_tree_host_client.h",
@@ -526,6 +500,8 @@ component("cc") {
     "trees/scoped_abort_remaining_swap_promises.h",
     "trees/single_thread_proxy.cc",
     "trees/single_thread_proxy.h",
+    "trees/swap_promise_monitor.cc",
+    "trees/swap_promise_monitor.h",
     "trees/thread_proxy.cc",
     "trees/thread_proxy.h",
     "trees/tree_synchronizer.cc",
@@ -536,6 +512,7 @@ component("cc") {
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   public_deps = [
+    "//cc/base",
     "//skia",
   ]
   deps = [