Roll Chrome into Mojo.

mojo/tools/roll/cc_strip_video.patch

Index: mojo/tools/roll/cc_strip_video.patch
diff --git a/mojo/tools/roll/cc_strip_video.patch b/mojo/tools/roll/cc_strip_video.patch
index f4e4a2482d616d02e927086b64bd1c91858841c9..36ed0f89861305afa545a488ecab853ecf011161 100644
--- a/mojo/tools/roll/cc_strip_video.patch
+++ b/mojo/tools/roll/cc_strip_video.patch
@@ -1,5 +1,5 @@
 diff --git a/cc/BUILD.gn b/cc/BUILD.gn
-index 8ffaddc..e42f2f0 100644
+index 1100151..44896c1 100644
 --- a/cc/BUILD.gn
 +++ b/cc/BUILD.gn
 @@ -214,13 +214,6 @@ component("cc") {
@@ -16,7 +16,7 @@ index 8ffaddc..e42f2f0 100644
      "output/begin_frame_args.cc",
      "output/begin_frame_args.h",
      "output/bsp_tree.cc",
-@@ -457,8 +450,6 @@ component("cc") {
+@@ -464,8 +457,6 @@ component("cc") {
      "resources/ui_resource_client.h",
      "resources/ui_resource_request.cc",
      "resources/ui_resource_request.h",
@@ -25,7 +25,7 @@ index 8ffaddc..e42f2f0 100644
      "resources/zero_copy_tile_task_worker_pool.cc",
      "resources/zero_copy_tile_task_worker_pool.h",
      "scheduler/begin_frame_source.cc",
-@@ -600,8 +591,6 @@ source_set("test_support") {
+@@ -607,8 +598,6 @@ source_set("test_support") {
      "test/fake_tile_manager_client.h",
      "test/fake_ui_resource_layer_tree_host_impl.cc",
      "test/fake_ui_resource_layer_tree_host_impl.h",
@@ -34,7 +34,7 @@ index 8ffaddc..e42f2f0 100644
      "test/failure_output_surface.cc",
      "test/failure_output_surface.h",
      "test/geometry_test_utils.cc",
-@@ -757,7 +746,6 @@ test("cc_unittests") {
+@@ -764,7 +753,6 @@ test("cc_unittests") {
      "layers/tiled_layer_unittest.cc",
      "layers/ui_resource_layer_impl_unittest.cc",
      "layers/ui_resource_layer_unittest.cc",
@@ -42,7 +42,7 @@ index 8ffaddc..e42f2f0 100644
      "output/begin_frame_args_unittest.cc",
      "output/delegating_renderer_unittest.cc",
      "output/filter_operations_unittest.cc",
-@@ -789,7 +777,6 @@ test("cc_unittests") {
+@@ -796,7 +784,6 @@ test("cc_unittests") {
      "resources/texture_uploader_unittest.cc",
      "resources/tile_manager_unittest.cc",
      "resources/tile_priority_unittest.cc",
@@ -50,7 +50,7 @@ index 8ffaddc..e42f2f0 100644
      "scheduler/begin_frame_source_unittest.cc",
      "scheduler/delay_based_time_source_unittest.cc",
      "scheduler/scheduler_state_machine_unittest.cc",
-@@ -818,7 +805,6 @@ test("cc_unittests") {
+@@ -825,7 +812,6 @@ test("cc_unittests") {
      "trees/layer_tree_host_unittest_picture.cc",
      "trees/layer_tree_host_unittest_proxy.cc",
      "trees/layer_tree_host_unittest_scroll.cc",
@@ -612,7 +612,7 @@ index e1c5410..edda34a 100644
  
  namespace cc {
 diff --git a/cc/resources/drawing_display_item.cc b/cc/resources/drawing_display_item.cc
-index 4efe9f3..7eb7573 100644
+index f8d3c62..eb05e33 100644
 --- a/cc/resources/drawing_display_item.cc
 +++ b/cc/resources/drawing_display_item.cc
 @@ -4,6 +4,7 @@
@@ -621,8 +621,8 @@ index 4efe9f3..7eb7573 100644
  
 +#include "base/logging.h"
  #include "third_party/skia/include/core/SkCanvas.h"
+ #include "third_party/skia/include/core/SkDrawPictureCallback.h"
  #include "third_party/skia/include/core/SkMatrix.h"
- #include "third_party/skia/include/core/SkPicture.h"
 diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
 index fb2fdb6..6c46d8f 100644
 --- a/cc/trees/layer_tree_host_impl_unittest.cc
@@ -704,7 +704,7 @@ index fb2fdb6..6c46d8f 100644
    EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
    host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
 diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
-index f188260..84210e0 100644
+index 50ace9b..69e5272 100644
 --- a/cc/trees/layer_tree_host_unittest.cc
 +++ b/cc/trees/layer_tree_host_unittest.cc
 @@ -18,7 +18,6 @@