Update from https://crrev.com/316786

mojo/tools/roll/cc_strip_video.patch

 diff --git a/cc/BUILD.gn b/cc/BUILD.gn
 index 41f99e2..d6fd028 100644
 --- a/cc/BUILD.gn
 +++ b/cc/BUILD.gn
 @@ -222,13 +222,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",
@@ skipping 110 matching lines @@
 -  // should no longer be referenced after the call is made. Only the current
 -  // provider client should call this function.
 -  virtual void PutCurrentFrame(
 -      const scoped_refptr<media::VideoFrame>& frame) = 0;
 -};
 -
 -}  // namespace cc
 -
 -#endif  // CC_LAYERS_VIDEO_FRAME_PROVIDER_H_
 diff --git a/cc/layers/video_frame_provider_client_impl.cc b/cc/layers/video_frame_provider_client_impl.cc
-index 2b12567..e69de29 100644
+deleted file mode 100644
+index 4bbd92f..0000000
 --- a/cc/layers/video_frame_provider_client_impl.cc
-+++ b/cc/layers/video_frame_provider_client_impl.cc
-@@ -1,95 +0,0 @@
++++ /dev/null
+@@ -1,116 +0,0 @@
 -// Copyright 2013 The Chromium Authors. All rights reserved.
 -// Use of this source code is governed by a BSD-style license that can be
 -// found in the LICENSE file.
 -
 -#include "cc/layers/video_frame_provider_client_impl.h"
 -
 -#include "base/trace_event/trace_event.h"
 -#include "cc/base/math_util.h"
 -#include "cc/layers/video_layer_impl.h"
 -#include "media/base/video_frame.h"
@@ skipping 21 matching lines @@
 -
 -  // This matrix is the default transformation for stream textures, and flips
 -  // on the Y axis.
 -  stream_texture_matrix_ = gfx::Transform(
 -      1.0, 0.0, 0.0, 0.0,
 -      0.0, -1.0, 0.0, 1.0,
 -      0.0, 0.0, 1.0, 0.0,
 -      0.0, 0.0, 0.0, 1.0);
 -}
 -
+-void VideoFrameProviderClientImpl::SetActiveVideoLayer(
+-    VideoLayerImpl* video_layer) {
+-  DCHECK(thread_checker_.CalledOnValidThread());
+-  DCHECK(video_layer);
+-  active_video_layer_ = video_layer;
+-}
+-
 -void VideoFrameProviderClientImpl::Stop() {
+-  // It's called when the main thread is blocked, so lock isn't needed.
 -  if (!provider_)
 -    return;
+-  DCHECK(thread_checker_.CalledOnValidThread());
 -  provider_->SetVideoFrameProviderClient(nullptr);
 -  provider_ = nullptr;
 -}
 -
+-bool VideoFrameProviderClientImpl::Stopped() {
+-  DCHECK(thread_checker_.CalledOnValidThread());
+-  // |provider_| is changed while the main thread is blocked, and not changed
+-  // thereafter, so lock isn't needed.
+-  return !provider_;
+-}
+-
 -scoped_refptr<media::VideoFrame>
 -VideoFrameProviderClientImpl::AcquireLockAndCurrentFrame() {
+-  DCHECK(thread_checker_.CalledOnValidThread());
 -  provider_lock_.Acquire();  // Balanced by call to ReleaseLock().
 -  if (!provider_)
 -    return nullptr;
 -
 -  return provider_->GetCurrentFrame();
 -}
 -
 -void VideoFrameProviderClientImpl::PutCurrentFrame(
 -    const scoped_refptr<media::VideoFrame>& frame) {
+-  DCHECK(thread_checker_.CalledOnValidThread());
 -  provider_lock_.AssertAcquired();
 -  provider_->PutCurrentFrame(frame);
 -}
 -
 -void VideoFrameProviderClientImpl::ReleaseLock() {
+-  DCHECK(thread_checker_.CalledOnValidThread());
 -  provider_lock_.AssertAcquired();
 -  provider_lock_.Release();
 -}
 -
 -void VideoFrameProviderClientImpl::StopUsingProvider() {
 -  // Block the provider from shutting down until this client is done
 -  // using the frame.
 -  base::AutoLock locker(provider_lock_);
 -  provider_ = nullptr;
 -}
 -
 -void VideoFrameProviderClientImpl::DidReceiveFrame() {
 -  TRACE_EVENT1("cc",
 -               "VideoFrameProviderClientImpl::DidReceiveFrame",
 -               "active_video_layer",
 -               !!active_video_layer_);
+-  DCHECK(thread_checker_.CalledOnValidThread());
 -  if (active_video_layer_)
 -    active_video_layer_->SetNeedsRedraw();
 -}
 -
 -void VideoFrameProviderClientImpl::DidUpdateMatrix(const float* matrix) {
+-  DCHECK(thread_checker_.CalledOnValidThread());
 -  stream_texture_matrix_ = gfx::Transform(
 -      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 45d98b6..5a15efa 100644
+index a394a1a..2612f10 100644
 --- a/cc/output/gl_renderer.cc
 +++ b/cc/output/gl_renderer.cc
 @@ -13,7 +13,6 @@
  #include "base/logging.h"
  #include "base/trace_event/trace_event.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 d503cc4..c7582fe 100644
+index 36765ce..d7d1211 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"
@@ skipping 445 matching lines @@
 -  EXPECT_TRUE(this->RunPixelTest(
 -      &pass_list,
 -      base::FilePath(FILE_PATH_LITERAL("black.png")),
 -      ExactPixelComparator(true)));
 -}
 -
  TYPED_TEST(RendererPixelTest, FastPassColorFilterAlpha) {
    gfx::Rect viewport_rect(this->device_viewport_size_);
  
 diff --git a/cc/quads/yuv_video_draw_quad.h b/cc/quads/yuv_video_draw_quad.h
-index 61f11a2..7ad0ba4 100644
+index 99ed7e2..d57d56f 100644
 --- a/cc/quads/yuv_video_draw_quad.h
 +++ b/cc/quads/yuv_video_draw_quad.h
 @@ -8,7 +8,6 @@
  #include "base/basictypes.h"
  #include "base/memory/scoped_ptr.h"
  #include "cc/base/cc_export.h"
 -#include "cc/layers/video_layer_impl.h"
  #include "cc/quads/draw_quad.h"
  
  namespace cc {
 diff --git a/cc/resources/drawing_display_item.cc b/cc/resources/drawing_display_item.cc
-index 29cc2d3..351fade 100644
+index 0fe86f4..1ef149f 100644
 --- a/cc/resources/drawing_display_item.cc
 +++ b/cc/resources/drawing_display_item.cc
 @@ -6,6 +6,7 @@
  
  #include <string>
  
 +#include "base/logging.h"
  #include "base/strings/stringprintf.h"
  #include "base/trace_event/trace_event_argument.h"
  #include "cc/debug/picture_debug_util.h"
 diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
-index cb33686..b016fff 100644
+index aa46125..07fb048 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 {
 @@ -96,7 +92,6 @@ class LayerTreeHostImplTest : public testing::Test,
          reduce_memory_result_(true),
          current_limit_bytes_(0),
          current_priority_cutoff_value_(0) {
 -    media::InitializeMediaLibraryForTesting();
    }
  
    LayerTreeSettings DefaultSettings() {
-@@ -5312,18 +5307,6 @@ TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {
+@@ -5489,18 +5484,6 @@ TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {
    root_layer->SetBounds(gfx::Size(10, 10));
    root_layer->SetHasRenderSurface(true);
  
 -  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));
-@@ -6403,16 +6386,6 @@ TEST_F(LayerTreeHostImplTest,
+@@ -6580,16 +6563,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 a3c37ed..d4bfb6e 100644
+index bb315e7..bb6dc17 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/impl_side_painting_settings.h"
  #include "cc/test/layer_tree_test.h"
-@@ -4200,28 +4198,6 @@ class LayerInvalidateCausesDraw : public LayerTreeHostTest {
+@@ -4202,28 +4200,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 56e52ad..fb0c9c8 100644
+index 596adc0..fb0c9c8 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"
@@ skipping 17 matching lines @@
  namespace cc {
  namespace {
 @@ -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() {
-@@ -1057,43 +1050,6 @@ class LayerTreeHostContextTestDontUseLostResources
+@@ -1057,41 +1050,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 =
 -        VideoLayer::Create(&hw_frame_provider_, media::VIDEO_ROTATION_0);
 -    video_hw->SetBounds(gfx::Size(10, 10));
 -    video_hw->SetIsDrawable(true);
 -    root->AddChild(video_hw);
 -
 -    scoped_refptr<VideoLayer> video_scaled_hw =
 -        VideoLayer::Create(&scaled_hw_frame_provider_, media::VIDEO_ROTATION_0);
 -    video_scaled_hw->SetBounds(gfx::Size(10, 10));
 -    video_scaled_hw->SetIsDrawable(true);
 -    root->AddChild(video_scaled_hw);
 -
 -    color_video_frame_ = VideoFrame::CreateColorFrame(
 -        gfx::Size(4, 4), 0x80, 0x80, 0x80, base::TimeDelta());
 -    hw_video_frame_ = VideoFrame::WrapNativeTexture(
 -        make_scoped_ptr(
 -            new gpu::MailboxHolder(mailbox, GL_TEXTURE_2D, sync_point)),
 -        media::VideoFrame::ReleaseMailboxCB(), gfx::Size(4, 4),
--        gfx::Rect(0, 0, 4, 4), gfx::Size(4, 4), base::TimeDelta(),
--        VideoFrame::ReadPixelsCB(), false);
+-        gfx::Rect(0, 0, 4, 4), gfx::Size(4, 4), base::TimeDelta(), false);
 -    scaled_hw_video_frame_ = VideoFrame::WrapNativeTexture(
 -        make_scoped_ptr(
 -            new gpu::MailboxHolder(mailbox, GL_TEXTURE_2D, sync_point)),
 -        media::VideoFrame::ReleaseMailboxCB(), gfx::Size(4, 4),
--        gfx::Rect(0, 0, 3, 2), gfx::Size(4, 4), base::TimeDelta(),
--        VideoFrame::ReadPixelsCB(), false);
+-        gfx::Rect(0, 0, 3, 2), gfx::Size(4, 4), base::TimeDelta(), false);
 -
 -    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();
-@@ -1123,14 +1079,6 @@ class LayerTreeHostContextTestDontUseLostResources
+@@ -1121,14 +1079,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,
-@@ -1179,14 +1127,6 @@ class LayerTreeHostContextTestDontUseLostResources
+@@ -1177,14 +1127,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);