Update from https://crrev.com/308331

mojo/tools/roll/cc_strip_video.patch

 diff --git a/cc/BUILD.gn b/cc/BUILD.gn
-index c744c5b..16a1589 100644
+index 826e12c..13e974d 100644
 --- a/cc/BUILD.gn
 +++ b/cc/BUILD.gn
-@@ -212,13 +212,6 @@ component("cc") {
+@@ -213,13 +213,6 @@ component("cc") {
      "layers/ui_resource_layer.h",
      "layers/ui_resource_layer_impl.cc",
      "layers/ui_resource_layer_impl.h",
 -    "layers/video_frame_provider.h",
 -    "layers/video_frame_provider_client_impl.cc",
 -    "layers/video_frame_provider_client_impl.h",
 -    "layers/video_layer.cc",
 -    "layers/video_layer.h",
 -    "layers/video_layer_impl.cc",
 -    "layers/video_layer_impl.h",
      "output/begin_frame_args.cc",
      "output/begin_frame_args.h",
      "output/bsp_tree.cc",
-@@ -453,8 +446,6 @@ component("cc") {
+@@ -456,8 +449,6 @@ component("cc") {
      "resources/ui_resource_client.h",
      "resources/ui_resource_request.cc",
      "resources/ui_resource_request.h",
 -    "resources/video_resource_updater.cc",
 -    "resources/video_resource_updater.h",
      "resources/zero_copy_tile_task_worker_pool.cc",
      "resources/zero_copy_tile_task_worker_pool.h",
      "scheduler/begin_frame_source.cc",
-@@ -588,8 +579,6 @@ source_set("test_support") {
+@@ -590,8 +581,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",
 -    "test/fake_video_frame_provider.cc",
 -    "test/fake_video_frame_provider.h",
+     "test/failure_output_surface.cc",
+     "test/failure_output_surface.h",
      "test/geometry_test_utils.cc",
-     "test/geometry_test_utils.h",
-     "test/test_in_process_context_provider.cc",
-@@ -744,7 +733,6 @@ test("cc_unittests") {
+@@ -747,7 +736,6 @@ test("cc_unittests") {
      "layers/tiled_layer_unittest.cc",
      "layers/ui_resource_layer_impl_unittest.cc",
      "layers/ui_resource_layer_unittest.cc",
 -    "layers/video_layer_impl_unittest.cc",
      "output/begin_frame_args_unittest.cc",
      "output/delegating_renderer_unittest.cc",
      "output/filter_operations_unittest.cc",
-@@ -775,7 +763,6 @@ test("cc_unittests") {
+@@ -778,7 +766,6 @@ test("cc_unittests") {
      "resources/texture_uploader_unittest.cc",
      "resources/tile_manager_unittest.cc",
      "resources/tile_priority_unittest.cc",
 -    "resources/video_resource_updater_unittest.cc",
      "scheduler/begin_frame_source_unittest.cc",
      "scheduler/delay_based_time_source_unittest.cc",
      "scheduler/scheduler_state_machine_unittest.cc",
-@@ -804,7 +791,6 @@ test("cc_unittests") {
+@@ -807,7 +794,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",
 -    "trees/layer_tree_host_unittest_video.cc",
      "trees/layer_tree_impl_unittest.cc",
      "trees/occlusion_tracker_unittest.cc",
      "trees/occlusion_unittest.cc",
 diff --git a/cc/layers/video_frame_provider.h b/cc/layers/video_frame_provider.h
 deleted file mode 100644
 index 784d951..0000000
@@ skipping 158 matching lines @@
 -      matrix[0], matrix[4], matrix[8], matrix[12],
 -      matrix[1], matrix[5], matrix[9], matrix[13],
 -      matrix[2], matrix[6], matrix[10], matrix[14],
 -      matrix[3], matrix[7], matrix[11], matrix[15]);
 -  if (active_video_layer_)
 -    active_video_layer_->SetNeedsRedraw();
 -}
 -
 -}  // namespace cc
 diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
-index 27f40eb..49af1c3 100644
+index ee94a4c..7896bb8 100644
 --- a/cc/output/gl_renderer.cc
 +++ b/cc/output/gl_renderer.cc
 @@ -13,7 +13,6 @@
  #include "base/debug/trace_event.h"
  #include "base/logging.h"
  #include "cc/base/math_util.h"
 -#include "cc/layers/video_layer_impl.h"
  #include "cc/output/compositor_frame.h"
  #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 0c2bc3d..d112ed1 100644
+index b51aef6..58205a9 100644
 --- a/cc/output/renderer_pixeltest.cc
 +++ b/cc/output/renderer_pixeltest.cc
 @@ -12,7 +12,6 @@
  #include "cc/test/fake_picture_pile_impl.h"
  #include "cc/test/pixel_test.h"
  #include "gpu/command_buffer/client/gles2_interface.h"
 -#include "media/base/video_frame.h"
  #include "third_party/skia/include/core/SkColorPriv.h"
  #include "third_party/skia/include/core/SkImageFilter.h"
  #include "third_party/skia/include/core/SkMatrix.h"
-@@ -385,346 +384,6 @@ TEST_F(GLRendererPixelTest, NonPremultipliedTextureWithBackground) {
+@@ -386,346 +385,6 @@ TEST_F(GLRendererPixelTest, NonPremultipliedTextureWithBackground) {
        FuzzyPixelOffByOneComparator(true)));
  }
  
 -class VideoGLRendererPixelTest : public GLRendererPixelTest {
 - protected:
 -  void CreateTestYUVVideoDrawQuad_Striped(const SharedQuadState* shared_state,
 -                                          media::VideoFrame::Format format,
 -                                          bool is_transparent,
 -                                          const gfx::RectF& tex_coord_rect,
 -                                          RenderPass* render_pass) {
@@ skipping 351 matching lines @@
 +++ b/cc/resources/drawing_display_item.cc
 @@ -4,6 +4,7 @@
  
  #include "cc/resources/drawing_display_item.h"
  
 +#include "base/logging.h"
  #include "third_party/skia/include/core/SkCanvas.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 f31cde0..4e070e2 100644
+index fc4780f..61bda89 100644
 --- a/cc/trees/layer_tree_host_impl_unittest.cc
 +++ b/cc/trees/layer_tree_host_impl_unittest.cc
 @@ -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"
 -#include "cc/layers/video_layer_impl.h"
  #include "cc/output/begin_frame_args.h"
  #include "cc/output/compositor_frame_ack.h"
  #include "cc/output/compositor_frame_metadata.h"
@@ skipping 22 matching lines @@
  namespace cc {
  namespace {
 @@ -94,7 +90,6 @@ class LayerTreeHostImplTest : public testing::Test,
          reduce_memory_result_(true),
          current_limit_bytes_(0),
          current_priority_cutoff_value_(0) {
 -    media::InitializeMediaLibraryForTesting();
    }
  
    LayerTreeSettings DefaultSettings() {
-@@ -5247,18 +5242,6 @@ TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {
+@@ -5248,18 +5243,6 @@ TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {
        LayerImpl::Create(host_impl_->active_tree(), 1);
    root_layer->SetBounds(gfx::Size(10, 10));
  
 -  scoped_refptr<VideoFrame> softwareFrame =
 -      media::VideoFrame::CreateColorFrame(
 -          gfx::Size(4, 4), 0x80, 0x80, 0x80, base::TimeDelta());
 -  FakeVideoFrameProvider provider;
 -  provider.set_frame(softwareFrame);
 -  scoped_ptr<VideoLayerImpl> video_layer = VideoLayerImpl::Create(
 -      host_impl_->active_tree(), 4, &provider, media::VIDEO_ROTATION_0);
 -  video_layer->SetBounds(gfx::Size(10, 10));
 -  video_layer->SetContentBounds(gfx::Size(10, 10));
 -  video_layer->SetDrawsContent(true);
 -  root_layer->AddChild(video_layer.Pass());
 -
    scoped_ptr<IOSurfaceLayerImpl> io_surface_layer =
        IOSurfaceLayerImpl::Create(host_impl_->active_tree(), 5);
    io_surface_layer->SetBounds(gfx::Size(10, 10));
-@@ -6321,16 +6304,6 @@ TEST_F(LayerTreeHostImplTest,
+@@ -6322,16 +6305,6 @@ TEST_F(LayerTreeHostImplTest,
    scoped_ptr<SolidColorLayerImpl> root_layer =
        SolidColorLayerImpl::Create(host_impl_->active_tree(), 1);
  
 -  // VideoLayerImpl will not be drawn.
 -  FakeVideoFrameProvider provider;
 -  scoped_ptr<VideoLayerImpl> video_layer = VideoLayerImpl::Create(
 -      host_impl_->active_tree(), 2, &provider, media::VIDEO_ROTATION_0);
 -  video_layer->SetBounds(gfx::Size(10, 10));
 -  video_layer->SetContentBounds(gfx::Size(10, 10));
 -  video_layer->SetDrawsContent(true);
 -  root_layer->AddChild(video_layer.Pass());
 -  SetupRootLayerImpl(root_layer.Pass());
 -
    LayerTreeHostImpl::FrameData frame;
    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 712909f..51c5d7e 100644
+index a343466..eee6275 100644
 --- a/cc/trees/layer_tree_host_unittest.cc
 +++ b/cc/trees/layer_tree_host_unittest.cc
 @@ -18,7 +18,6 @@
  #include "cc/layers/painted_scrollbar_layer.h"
  #include "cc/layers/picture_layer.h"
  #include "cc/layers/solid_color_layer.h"
 -#include "cc/layers/video_layer.h"
  #include "cc/output/begin_frame_args.h"
  #include "cc/output/compositor_frame_ack.h"
  #include "cc/output/copy_output_request.h"
 @@ -41,7 +40,6 @@
  #include "cc/test/fake_picture_pile.h"
  #include "cc/test/fake_proxy.h"
  #include "cc/test/fake_scoped_ui_resource.h"
 -#include "cc/test/fake_video_frame_provider.h"
  #include "cc/test/geometry_test_utils.h"
  #include "cc/test/layer_tree_test.h"
  #include "cc/test/test_shared_bitmap_manager.h"
-@@ -4189,28 +4187,6 @@ class LayerInvalidateCausesDraw : public LayerTreeHostTest {
+@@ -4183,28 +4181,6 @@ class LayerInvalidateCausesDraw : public LayerTreeHostTest {
    int num_draws_;
  };
  
 -// VideoLayer must support being invalidated and then passing that along
 -// to the compositor thread, even though no resources are updated in
 -// response to that invalidation.
 -class LayerTreeHostTestVideoLayerInvalidate : public LayerInvalidateCausesDraw {
 - public:
 -  void SetupTree() override {
 -    LayerTreeHostTest::SetupTree();
 -    scoped_refptr<VideoLayer> video_layer =
 -        VideoLayer::Create(&provider_, media::VIDEO_ROTATION_0);
 -    video_layer->SetBounds(gfx::Size(10, 10));
 -    video_layer->SetIsDrawable(true);
 -    layer_tree_host()->root_layer()->AddChild(video_layer);
 -
 -    invalidate_layer_ = video_layer;
 -  }
 -
 - private:
 -  FakeVideoFrameProvider provider_;
 -};
 -
 -SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestVideoLayerInvalidate);
 -
  // IOSurfaceLayer must support being invalidated and then passing that along
  // 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 2d23d75..b646e6a 100644
+index 24ffcd4..cc4f28f 100644
 --- a/cc/trees/layer_tree_host_unittest_context.cc
 +++ b/cc/trees/layer_tree_host_unittest_context.cc
 @@ -15,8 +15,6 @@
  #include "cc/layers/picture_layer.h"
  #include "cc/layers/texture_layer.h"
  #include "cc/layers/texture_layer_impl.h"
 -#include "cc/layers/video_layer.h"
 -#include "cc/layers/video_layer_impl.h"
  #include "cc/output/filter_operations.h"
  #include "cc/resources/single_release_callback.h"
- #include "cc/test/fake_content_layer.h"
-@@ -32,7 +30,6 @@
+ #include "cc/test/failure_output_surface.h"
+@@ -33,7 +31,6 @@
  #include "cc/test/fake_picture_layer_impl.h"
  #include "cc/test/fake_scoped_ui_resource.h"
  #include "cc/test/fake_scrollbar.h"
 -#include "cc/test/fake_video_frame_provider.h"
  #include "cc/test/layer_tree_test.h"
  #include "cc/test/render_pass_test_common.h"
  #include "cc/test/test_context_provider.h"
-@@ -42,9 +39,6 @@
+@@ -43,9 +40,6 @@
  #include "cc/trees/layer_tree_impl.h"
  #include "cc/trees/single_thread_proxy.h"
  #include "gpu/GLES2/gl2extchromium.h"
 -#include "media/base/media.h"
 -
 -using media::VideoFrame;
  
  namespace cc {
  namespace {
-@@ -65,7 +59,6 @@ class LayerTreeHostContextTest : public LayerTreeTest {
+@@ -66,7 +60,6 @@ class LayerTreeHostContextTest : public LayerTreeTest {
          context_should_support_io_surface_(false),
          fallback_context_works_(false),
          async_output_surface_creation_(false) {
 -    media::InitializeMediaLibraryForTesting();
    }
  
    void LoseContext() {
-@@ -1083,49 +1076,6 @@ class LayerTreeHostContextTestDontUseLostResources
+@@ -1041,49 +1034,6 @@ class LayerTreeHostContextTestDontUseLostResources
      layer_with_mask->SetMaskLayer(mask.get());
      root->AddChild(layer_with_mask);
  
 -    scoped_refptr<VideoLayer> video_color =
 -        VideoLayer::Create(&color_frame_provider_, media::VIDEO_ROTATION_0);
 -    video_color->SetBounds(gfx::Size(10, 10));
 -    video_color->SetIsDrawable(true);
 -    root->AddChild(video_color);
 -
 -    scoped_refptr<VideoLayer> video_hw =
@@ skipping 29 matching lines @@
 -                                      base::TimeDelta(),
 -                                      VideoFrame::ReadPixelsCB());
 -
 -    color_frame_provider_.set_frame(color_video_frame_);
 -    hw_frame_provider_.set_frame(hw_video_frame_);
 -    scaled_hw_frame_provider_.set_frame(scaled_hw_video_frame_);
 -
      if (!delegating_renderer()) {
        // TODO(danakj): IOSurface layer can not be transported. crbug.com/239335
        scoped_refptr<IOSurfaceLayer> io_surface = IOSurfaceLayer::Create();
-@@ -1155,14 +1105,6 @@ class LayerTreeHostContextTestDontUseLostResources
+@@ -1113,14 +1063,6 @@ class LayerTreeHostContextTestDontUseLostResources
  
    void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
      LayerTreeHostContextTest::CommitCompleteOnThread(host_impl);
 -
 -    if (host_impl->active_tree()->source_frame_number() == 3) {
 -      // On the third commit we're recovering from context loss. Hardware
 -      // video frames should not be reused by the VideoFrameProvider, but
 -      // software frames can be.
 -      hw_frame_provider_.set_frame(NULL);
 -      scaled_hw_frame_provider_.set_frame(NULL);
 -    }
    }
  
    DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
-@@ -1212,14 +1154,6 @@ class LayerTreeHostContextTestDontUseLostResources
+@@ -1169,14 +1111,6 @@ class LayerTreeHostContextTestDontUseLostResources
    scoped_refptr<DelegatedFrameResourceCollection>
        delegated_resource_collection_;
    scoped_refptr<DelegatedFrameProvider> delegated_frame_provider_;
 -
 -  scoped_refptr<VideoFrame> color_video_frame_;
 -  scoped_refptr<VideoFrame> hw_video_frame_;
 -  scoped_refptr<VideoFrame> scaled_hw_video_frame_;
 -
 -  FakeVideoFrameProvider color_frame_provider_;
 -  FakeVideoFrameProvider hw_frame_provider_;
 -  FakeVideoFrameProvider scaled_hw_frame_provider_;
  };
  
  SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostContextTestDontUseLostResources);