Update from https://crrev.com/314320

mojo/tools/roll/cc_strip_video.patch

 diff --git a/cc/BUILD.gn b/cc/BUILD.gn
-index 2ede4ac..eee115c 100644
+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",
 -    "layers/video_frame_provider_client_impl.h",
 -    "layers/video_layer.cc",
@@ skipping 14 matching lines @@
      "scheduler/begin_frame_source.cc",
 @@ -623,8 +614,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",
-@@ -782,7 +771,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",
-@@ -814,7 +802,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",
-@@ -843,7 +830,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",
+@@ -783,7 +772,6 @@ if (!is_win || link_chrome_on_windows) {
+       "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",
+@@ -815,7 +803,6 @@ if (!is_win || link_chrome_on_windows) {
+       "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",
+@@ -844,7 +831,6 @@ if (!is_win || link_chrome_on_windows) {
+       "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
 --- a/cc/layers/video_frame_provider.h
 +++ /dev/null
 @@ -1,63 +0,0 @@
 -// Copyright (c) 2012 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.
 -
@@ skipping 50 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
-deleted file mode 100644
-index 50333c1..0000000
+index 2b12567..e69de29 100644
 --- a/cc/layers/video_frame_provider_client_impl.cc
-+++ /dev/null
++++ b/cc/layers/video_frame_provider_client_impl.cc
 @@ -1,95 +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/debug/trace_event.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"
 -
 -namespace cc {
 -
 -// static
 -scoped_refptr<VideoFrameProviderClientImpl>
 -    VideoFrameProviderClientImpl::Create(
 -        VideoFrameProvider* provider) {
@@ skipping 69 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 9c856e8..e40a4fc 100644
+index 45d98b6..5a15efa 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 "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 08a4053..c7582fe 100644
+index d503cc4..c7582fe 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"
-@@ -386,346 +385,6 @@ TEST_F(GLRendererPixelTest, NonPremultipliedTextureWithBackground) {
+@@ -386,453 +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 20 matching lines @@
 -      uint8_t* u_row = video_frame->data(media::VideoFrame::kUPlane) +
 -                       video_frame->stride(media::VideoFrame::kUPlane) * i;
 -      uint8_t* v_row = video_frame->data(media::VideoFrame::kVPlane) +
 -                       video_frame->stride(media::VideoFrame::kVPlane) * i;
 -      for (int j = 0; j < video_frame->row_bytes(media::VideoFrame::kUPlane);
 -           ++j) {
 -        u_row[j] = (u_value += 3);
 -        v_row[j] = (v_value += 5);
 -      }
 -    }
+-    uint8 alpha_value = is_transparent ? 0 : 128;
 -    CreateTestYUVVideoDrawQuad_FromVideoFrame(
--        shared_state, video_frame, is_transparent, tex_coord_rect, render_pass);
+-        shared_state, video_frame, alpha_value, tex_coord_rect, render_pass);
 -  }
 -
 -  void CreateTestYUVVideoDrawQuad_Solid(const SharedQuadState* shared_state,
 -                                        media::VideoFrame::Format format,
 -                                        bool is_transparent,
 -                                        const gfx::RectF& tex_coord_rect,
 -                                        uint8 y,
 -                                        uint8 u,
 -                                        uint8 v,
 -                                        RenderPass* render_pass) {
@@ skipping 11 matching lines @@
 -               video_frame->rows(media::VideoFrame::kYPlane));
 -    memset(video_frame->data(media::VideoFrame::kUPlane),
 -           u,
 -           video_frame->stride(media::VideoFrame::kUPlane) *
 -               video_frame->rows(media::VideoFrame::kUPlane));
 -    memset(video_frame->data(media::VideoFrame::kVPlane),
 -           v,
 -           video_frame->stride(media::VideoFrame::kVPlane) *
 -               video_frame->rows(media::VideoFrame::kVPlane));
 -
+-    uint8 alpha_value = is_transparent ? 0 : 128;
 -    CreateTestYUVVideoDrawQuad_FromVideoFrame(
--        shared_state, video_frame, is_transparent, tex_coord_rect, render_pass);
+-        shared_state, video_frame, alpha_value, tex_coord_rect, render_pass);
+-  }
+-
+-  void CreateEdgeBleedPass(media::VideoFrame::Format format,
+-                           RenderPassList* pass_list) {
+-    gfx::Rect rect(200, 200);
+-
+-    RenderPassId id(1, 1);
+-    scoped_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
+-
+-    // Scale the video up so that bilinear filtering kicks in to sample more
+-    // than just nearest neighbor would.
+-    gfx::Transform scale_by_2;
+-    scale_by_2.Scale(2.f, 2.f);
+-    gfx::Rect half_rect(100, 100);
+-    SharedQuadState* shared_state =
+-        CreateTestSharedQuadState(scale_by_2, half_rect, pass.get());
+-
+-    gfx::Size background_size(200, 200);
+-    gfx::Rect green_rect(16, 20, 100, 100);
+-    gfx::RectF tex_coord_rect(
+-        static_cast<float>(green_rect.x()) / background_size.width(),
+-        static_cast<float>(green_rect.y()) / background_size.height(),
+-        static_cast<float>(green_rect.width()) / background_size.width(),
+-        static_cast<float>(green_rect.height()) / background_size.height());
+-
+-    // YUV of (149,43,21) should be green (0,255,0) in RGB.
+-    // Create a video frame that has a non-green background rect, with a
+-    // green sub-rectangle that should be the only thing displayed in
+-    // the final image.  Bleeding will appear on all four sides of the video
+-    // if the tex coords are not clamped.
+-    CreateTestYUVVideoDrawQuad_TwoColor(shared_state, format, false,
+-                                        tex_coord_rect, background_size, 0, 0,
+-                                        0, green_rect, 149, 43, 21, pass.get());
+-    pass_list->push_back(pass.Pass());
+-  }
+-
+-  // Creates a video frame of size background_size filled with yuv_background,
+-  // and then draws a foreground rectangle in a different color on top of
+-  // that. The foreground rectangle must have coordinates that are divisible
+-  // by 2 because YUV is a block format.
+-  void CreateTestYUVVideoDrawQuad_TwoColor(const SharedQuadState* shared_state,
+-                                           media::VideoFrame::Format format,
+-                                           bool is_transparent,
+-                                           const gfx::RectF& tex_coord_rect,
+-                                           const gfx::Size& background_size,
+-                                           uint8 y_background,
+-                                           uint8 u_background,
+-                                           uint8 v_background,
+-                                           const gfx::Rect& foreground_rect,
+-                                           uint8 y_foreground,
+-                                           uint8 u_foreground,
+-                                           uint8 v_foreground,
+-                                           RenderPass* render_pass) {
+-    const gfx::Rect rect(background_size);
+-
+-    scoped_refptr<media::VideoFrame> video_frame =
+-        media::VideoFrame::CreateFrame(format, background_size, foreground_rect,
+-                                       foreground_rect.size(),
+-                                       base::TimeDelta());
+-
+-    int planes[] = {media::VideoFrame::kYPlane,
+-                    media::VideoFrame::kUPlane,
+-                    media::VideoFrame::kVPlane};
+-    uint8 yuv_background[] = {y_background, u_background, v_background};
+-    uint8 yuv_foreground[] = {y_foreground, u_foreground, v_foreground};
+-    int sample_size[] = {1, 2, 2};
+-
+-    for (int i = 0; i < 3; ++i) {
+-      memset(video_frame->data(planes[i]), yuv_background[i],
+-             video_frame->stride(planes[i]) * video_frame->rows(planes[i]));
+-    }
+-
+-    for (int i = 0; i < 3; ++i) {
+-      // Since yuv encoding uses block encoding, widths have to be divisible
+-      // by the sample size in order for this function to behave properly.
+-      DCHECK_EQ(foreground_rect.x() % sample_size[i], 0);
+-      DCHECK_EQ(foreground_rect.y() % sample_size[i], 0);
+-      DCHECK_EQ(foreground_rect.width() % sample_size[i], 0);
+-      DCHECK_EQ(foreground_rect.height() % sample_size[i], 0);
+-
+-      gfx::Rect sample_rect(foreground_rect.x() / sample_size[i],
+-                            foreground_rect.y() / sample_size[i],
+-                            foreground_rect.width() / sample_size[i],
+-                            foreground_rect.height() / sample_size[i]);
+-      for (int y = sample_rect.y(); y < sample_rect.bottom(); ++y) {
+-        for (int x = sample_rect.x(); x < sample_rect.right(); ++x) {
+-          size_t offset = y * video_frame->stride(planes[i]) + x;
+-          video_frame->data(planes[i])[offset] = yuv_foreground[i];
+-        }
+-      }
+-    }
+-
+-    uint8 alpha_value = 255;
+-    CreateTestYUVVideoDrawQuad_FromVideoFrame(
+-        shared_state, video_frame, alpha_value, tex_coord_rect, render_pass);
 -  }
 -
 -  void CreateTestYUVVideoDrawQuad_FromVideoFrame(
 -      const SharedQuadState* shared_state,
 -      scoped_refptr<media::VideoFrame> video_frame,
--      bool is_transparent,
+-      uint8 alpha_value,
 -      const gfx::RectF& tex_coord_rect,
 -      RenderPass* render_pass) {
 -    const bool with_alpha = (video_frame->format() == media::VideoFrame::YV12A);
 -    const YUVVideoDrawQuad::ColorSpace color_space =
 -        (video_frame->format() == media::VideoFrame::YV12J
 -             ? YUVVideoDrawQuad::REC_601_JPEG
 -             : YUVVideoDrawQuad::REC_601);
--    const gfx::Rect rect(this->device_viewport_size_);
+-    const gfx::Rect rect(shared_state->content_bounds);
 -    const gfx::Rect opaque_rect(0, 0, 0, 0);
 -
 -    if (with_alpha)
--      memset(video_frame->data(media::VideoFrame::kAPlane),
--             is_transparent ? 0 : 128,
+-      memset(video_frame->data(media::VideoFrame::kAPlane), alpha_value,
 -             video_frame->stride(media::VideoFrame::kAPlane) *
 -                 video_frame->rows(media::VideoFrame::kAPlane));
 -
 -    VideoFrameExternalResources resources =
 -        video_resource_updater_->CreateExternalResourcesFromVideoFrame(
 -            video_frame);
 -
 -    EXPECT_EQ(VideoFrameExternalResources::YUV_RESOURCE, resources.type);
 -    EXPECT_EQ(media::VideoFrame::NumPlanes(video_frame->format()),
 -              resources.mailboxes.size());
@@ skipping 18 matching lines @@
 -    ResourceProvider::ResourceId a_resource = 0;
 -    if (with_alpha) {
 -      a_resource = resource_provider_->CreateResourceFromTextureMailbox(
 -          resources.mailboxes[media::VideoFrame::kAPlane],
 -          SingleReleaseCallbackImpl::Create(
 -              resources.release_callbacks[media::VideoFrame::kAPlane]));
 -    }
 -
 -    YUVVideoDrawQuad* yuv_quad =
 -        render_pass->CreateAndAppendDrawQuad<YUVVideoDrawQuad>();
--    yuv_quad->SetNew(shared_state,
--                     rect,
--                     opaque_rect,
--                     rect,
--                     tex_coord_rect,
--                     y_resource,
--                     u_resource,
--                     v_resource,
--                     a_resource,
--                     color_space);
+-    yuv_quad->SetNew(shared_state, rect, opaque_rect, rect, tex_coord_rect,
+-                     video_frame->coded_size(), y_resource, u_resource,
+-                     v_resource, a_resource, color_space);
 -  }
 -
 -  void SetUp() override {
 -    GLRendererPixelTest::SetUp();
 -    video_resource_updater_.reset(new VideoResourceUpdater(
 -        output_surface_->context_provider(), resource_provider_.get()));
 -  }
 -
 - private:
 -  scoped_ptr<VideoResourceUpdater> video_resource_updater_;
@@ skipping 97 matching lines @@
 -                                   pass.get());
 -
 -  RenderPassList pass_list;
 -  pass_list.push_back(pass.Pass());
 -
 -  EXPECT_TRUE(this->RunPixelTest(&pass_list,
 -                                 base::FilePath(FILE_PATH_LITERAL("green.png")),
 -                                 FuzzyPixelOffByOneComparator(true)));
 -}
 -
+-// Test that a YUV video doesn't bleed outside of its tex coords when the
+-// tex coord rect is only a partial subrectangle of the coded contents.
+-TEST_F(VideoGLRendererPixelTest, YUVEdgeBleed) {
+-  RenderPassList pass_list;
+-  CreateEdgeBleedPass(media::VideoFrame::YV12J, &pass_list);
+-  EXPECT_TRUE(this->RunPixelTest(&pass_list,
+-                                 base::FilePath(FILE_PATH_LITERAL("green.png")),
+-                                 FuzzyPixelOffByOneComparator(true)));
+-}
+-
+-TEST_F(VideoGLRendererPixelTest, YUVAEdgeBleed) {
+-  RenderPassList pass_list;
+-  CreateEdgeBleedPass(media::VideoFrame::YV12A, &pass_list);
+-  EXPECT_TRUE(this->RunPixelTest(&pass_list,
+-                                 base::FilePath(FILE_PATH_LITERAL("green.png")),
+-                                 FuzzyPixelOffByOneComparator(true)));
+-}
+-
 -TEST_F(VideoGLRendererPixelTest, SimpleYUVJRectGrey) {
 -  gfx::Rect rect(this->device_viewport_size_);
 -
 -  RenderPassId id(1, 1);
 -  scoped_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
 -
 -  SharedQuadState* shared_state =
 -      CreateTestSharedQuadState(gfx::Transform(), rect, pass.get());
 -
 -  // Dark grey in JPEG color range (in MPEG, this is black).
@@ skipping 68 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 e1c5410..edda34a 100644
+index 61f11a2..7ad0ba4 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 e5610ca..473cb77 100644
+index 29cc2d3..351fade 100644
 --- a/cc/resources/drawing_display_item.cc
 +++ b/cc/resources/drawing_display_item.cc
-@@ -4,6 +4,7 @@
+@@ -6,6 +6,7 @@
  
- #include "cc/resources/drawing_display_item.h"
+ #include <string>
  
 +#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 "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 6ac2f8c..7804f22 100644
+index cb33686..b016fff 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() {
-@@ -5308,18 +5303,6 @@ TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {
+@@ -5312,18 +5307,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));
-@@ -6399,16 +6382,6 @@ TEST_F(LayerTreeHostImplTest,
+@@ -6403,16 +6386,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 5299d70..1e10588 100644
+index a3c37ed..d4bfb6e 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"
-@@ -4193,28 +4191,6 @@ class LayerInvalidateCausesDraw : public LayerTreeHostTest {
+@@ -4200,28 +4198,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 681ae4e..cc4f28f 100644
+index 56e52ad..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() {
-@@ -1041,43 +1034,6 @@ class LayerTreeHostContextTestDontUseLostResources
+@@ -1057,43 +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 =
@@ skipping 23 matching lines @@
 -        gfx::Rect(0, 0, 3, 2), gfx::Size(4, 4), base::TimeDelta(),
 -        VideoFrame::ReadPixelsCB(), 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();
-@@ -1107,14 +1063,6 @@ class LayerTreeHostContextTestDontUseLostResources
+@@ -1123,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,
-@@ -1163,14 +1111,6 @@ class LayerTreeHostContextTestDontUseLostResources
+@@ -1179,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);