Update from chromium https://crrev.com/301725/

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 6bae830ce8dbc14ab28cb16a4183e141915b76da..2bd6fb88204c1ae589df39cd38a0ceffcb4c4d99 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 74a3c4b..c1df4c9 100644
+index 24c5833..8cb8e8a 100644
 --- a/cc/BUILD.gn
 +++ b/cc/BUILD.gn
 @@ -208,13 +208,6 @@ component("cc") {
@@ -25,15 +25,15 @@ index 74a3c4b..c1df4c9 100644
      "resources/zero_copy_raster_worker_pool.cc",
      "resources/zero_copy_raster_worker_pool.h",
      "scheduler/begin_frame_source.cc",
-@@ -488,7 +479,6 @@ component("cc") {
-     "//base/third_party/dynamic_annotations",
+@@ -489,7 +480,6 @@ component("cc") {
      "//gpu",
      "//gpu/command_buffer/client:gles2_interface",
+     "//gpu/command_buffer/client:gpu_memory_buffer_manager",
 -    "//media",
      "//ui/events:events_base",
      "//ui/gfx",
      "//ui/gfx/geometry",
-@@ -557,8 +547,6 @@ source_set("test_support") {
+@@ -558,8 +548,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",
@@ -42,7 +42,7 @@ index 74a3c4b..c1df4c9 100644
      "test/geometry_test_utils.cc",
      "test/geometry_test_utils.h",
      "test/test_in_process_context_provider.cc",
-@@ -705,7 +693,6 @@ test("cc_unittests") {
+@@ -707,7 +695,6 @@ test("cc_unittests") {
      "layers/tiled_layer_unittest.cc",
      "layers/ui_resource_layer_impl_unittest.cc",
      "layers/ui_resource_layer_unittest.cc",
@@ -50,7 +50,7 @@ index 74a3c4b..c1df4c9 100644
      "output/begin_frame_args_unittest.cc",
      "output/delegating_renderer_unittest.cc",
      "output/filter_operations_unittest.cc",
-@@ -735,7 +722,6 @@ test("cc_unittests") {
+@@ -737,7 +724,6 @@ test("cc_unittests") {
      "resources/texture_uploader_unittest.cc",
      "resources/tile_manager_unittest.cc",
      "resources/tile_priority_unittest.cc",
@@ -58,7 +58,7 @@ index 74a3c4b..c1df4c9 100644
      "scheduler/begin_frame_source_unittest.cc",
      "scheduler/delay_based_time_source_unittest.cc",
      "scheduler/scheduler_state_machine_unittest.cc",
-@@ -763,7 +749,6 @@ test("cc_unittests") {
+@@ -765,7 +751,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",
@@ -66,7 +66,7 @@ index 74a3c4b..c1df4c9 100644
      "trees/layer_tree_impl_unittest.cc",
      "trees/occlusion_tracker_unittest.cc",
      "trees/occlusion_unittest.cc",
-@@ -790,7 +775,6 @@ test("cc_unittests") {
+@@ -792,7 +777,6 @@ test("cc_unittests") {
      "//gpu:test_support",
      "//gpu/command_buffer/client:gles2_interface",
      "//gpu/command_buffer/common:gles2_utils",
@@ -74,7 +74,7 @@ index 74a3c4b..c1df4c9 100644
      "//testing/gmock",
      "//testing/gtest",
      "//ui/events:events_base",
-@@ -822,7 +806,6 @@ test("cc_perftests") {
+@@ -824,7 +808,6 @@ test("cc_perftests") {
      "//gpu",
      "//gpu:test_support",
      "//gpu/command_buffer/common:gles2_utils",
@@ -253,7 +253,7 @@ index 50333c1..0000000
 -
 -}  // namespace cc
 diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
-index 61d233a..6b15faf 100644
+index a302f7e..b93ddcf 100644
 --- a/cc/output/gl_renderer.cc
 +++ b/cc/output/gl_renderer.cc
 @@ -13,7 +13,6 @@
@@ -265,7 +265,7 @@ index 61d233a..6b15faf 100644
  #include "cc/output/compositor_frame_metadata.h"
  #include "cc/output/context_provider.h"
 diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc
-index 3fe1caf..b2be4e6 100644
+index c172869..a0ce823 100644
 --- a/cc/output/renderer_pixeltest.cc
 +++ b/cc/output/renderer_pixeltest.cc
 @@ -12,7 +12,6 @@
@@ -636,10 +636,10 @@ index e1c5410..edda34a 100644
  
  namespace cc {
 diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
-index ec1100f..7b466d0 100644
+index fb23ba6..8e7fa0f 100644
 --- a/cc/trees/layer_tree_host_impl_unittest.cc
 +++ b/cc/trees/layer_tree_host_impl_unittest.cc
-@@ -26,7 +26,6 @@
+@@ -27,7 +27,6 @@
  #include "cc/layers/solid_color_scrollbar_layer_impl.h"
  #include "cc/layers/texture_layer_impl.h"
  #include "cc/layers/tiled_layer_impl.h"
@@ -647,7 +647,7 @@ index ec1100f..7b466d0 100644
  #include "cc/output/begin_frame_args.h"
  #include "cc/output/compositor_frame_ack.h"
  #include "cc/output/compositor_frame_metadata.h"
-@@ -47,7 +46,6 @@
+@@ -48,7 +47,6 @@
  #include "cc/test/fake_picture_pile_impl.h"
  #include "cc/test/fake_proxy.h"
  #include "cc/test/fake_rendering_stats_instrumentation.h"
@@ -655,7 +655,7 @@ index ec1100f..7b466d0 100644
  #include "cc/test/geometry_test_utils.h"
  #include "cc/test/layer_test_common.h"
  #include "cc/test/render_pass_test_common.h"
-@@ -56,7 +54,6 @@
+@@ -57,7 +55,6 @@
  #include "cc/test/test_web_graphics_context_3d.h"
  #include "cc/trees/layer_tree_impl.h"
  #include "cc/trees/single_thread_proxy.h"
@@ -663,7 +663,7 @@ index ec1100f..7b466d0 100644
  #include "testing/gmock/include/gmock/gmock.h"
  #include "testing/gtest/include/gtest/gtest.h"
  #include "third_party/skia/include/core/SkMallocPixelRef.h"
-@@ -70,7 +67,6 @@ using ::testing::Return;
+@@ -71,7 +68,6 @@ using ::testing::Return;
  using ::testing::AnyNumber;
  using ::testing::AtLeast;
  using ::testing::_;
@@ -671,7 +671,7 @@ index ec1100f..7b466d0 100644
  
  namespace cc {
  namespace {
-@@ -95,7 +91,6 @@ class LayerTreeHostImplTest : public testing::Test,
+@@ -96,7 +92,6 @@ class LayerTreeHostImplTest : public testing::Test,
          reduce_memory_result_(true),
          current_limit_bytes_(0),
          current_priority_cutoff_value_(0) {
@@ -679,7 +679,7 @@ index ec1100f..7b466d0 100644
    }
  
    LayerTreeSettings DefaultSettings() {
-@@ -5063,18 +5058,6 @@ TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {
+@@ -5090,18 +5085,6 @@ TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {
        LayerImpl::Create(host_impl_->active_tree(), 1);
    root_layer->SetBounds(gfx::Size(10, 10));
  
@@ -698,7 +698,7 @@ index ec1100f..7b466d0 100644
    scoped_ptr<IOSurfaceLayerImpl> io_surface_layer =
        IOSurfaceLayerImpl::Create(host_impl_->active_tree(), 5);
    io_surface_layer->SetBounds(gfx::Size(10, 10));
-@@ -6138,16 +6121,6 @@ TEST_F(LayerTreeHostImplTest,
+@@ -6165,16 +6148,6 @@ TEST_F(LayerTreeHostImplTest,
    scoped_ptr<SolidColorLayerImpl> root_layer =
        SolidColorLayerImpl::Create(host_impl_->active_tree(), 1);
  
@@ -716,7 +716,7 @@ index ec1100f..7b466d0 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 8fb9b8c..cb3cdef 100644
+index 8d554dc..d15c6a3 100644
 --- a/cc/trees/layer_tree_host_unittest.cc
 +++ b/cc/trees/layer_tree_host_unittest.cc
 @@ -18,7 +18,6 @@
@@ -765,7 +765,7 @@ index 8fb9b8c..cb3cdef 100644
  // to the compositor thread, even though no resources are updated in
  // response to that invalidation.
 diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
-index 8349bae..b9e15c6 100644
+index b12a8da..fb05300 100644
 --- a/cc/trees/layer_tree_host_unittest_context.cc
 +++ b/cc/trees/layer_tree_host_unittest_context.cc
 @@ -15,8 +15,6 @@
@@ -803,7 +803,7 @@ index 8349bae..b9e15c6 100644
    }
  
    void LoseContext() {
-@@ -1013,49 +1006,6 @@ class LayerTreeHostContextTestDontUseLostResources
+@@ -1083,49 +1076,6 @@ class LayerTreeHostContextTestDontUseLostResources
      layer_with_mask->SetMaskLayer(mask.get());
      root->AddChild(layer_with_mask);
  
@@ -853,7 +853,7 @@ index 8349bae..b9e15c6 100644
      if (!delegating_renderer()) {
        // TODO(danakj): IOSurface layer can not be transported. crbug.com/239335
        scoped_refptr<IOSurfaceLayer> io_surface = IOSurfaceLayer::Create();
-@@ -1085,14 +1035,6 @@ class LayerTreeHostContextTestDontUseLostResources
+@@ -1155,14 +1105,6 @@ class LayerTreeHostContextTestDontUseLostResources
  
    void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
      LayerTreeHostContextTest::CommitCompleteOnThread(host_impl);
@@ -868,7 +868,7 @@ index 8349bae..b9e15c6 100644
    }
  
    DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
-@@ -1142,14 +1084,6 @@ class LayerTreeHostContextTestDontUseLostResources
+@@ -1212,14 +1154,6 @@ class LayerTreeHostContextTestDontUseLostResources
    scoped_refptr<DelegatedFrameResourceCollection>
        delegated_resource_collection_;
    scoped_refptr<DelegatedFrameProvider> delegated_frame_provider_;