Update from https://crrev.com/309717

mojo/tools/roll/cc_strip_video.patch

 diff --git a/cc/BUILD.gn b/cc/BUILD.gn
-index 826e12c..13e974d 100644
+index 8ffaddc..e42f2f0 100644
 --- a/cc/BUILD.gn
 +++ b/cc/BUILD.gn
-@@ -213,13 +213,6 @@ component("cc") {
+@@ -214,13 +214,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",
-@@ -456,8 +449,6 @@ component("cc") {
+@@ -457,8 +450,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",
-@@ -590,8 +581,6 @@ source_set("test_support") {
+@@ -600,8 +591,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",
-@@ -747,7 +736,6 @@ test("cc_unittests") {
+@@ -757,7 +746,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",
-@@ -778,7 +766,6 @@ test("cc_unittests") {
+@@ -789,7 +777,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",
-@@ -807,7 +794,6 @@ test("cc_unittests") {
+@@ -818,7 +805,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 ee94a4c..7896bb8 100644
+index 9c856e8..e40a4fc 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 b51aef6..58205a9 100644
+index 08a4053..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"
@@ skipping 350 matching lines @@
 +++ 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 ecf7a75..9466d5c 100644
+index 4efe9f3..7eb7573 100644
 --- a/cc/resources/drawing_display_item.cc
 +++ 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 fc4780f..61bda89 100644
+index fb2fdb6..6c46d8f 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"
 @@ -47,7 +46,6 @@
  #include "cc/test/fake_picture_layer_impl.h"
  #include "cc/test/fake_picture_pile_impl.h"
  #include "cc/test/fake_proxy.h"
 -#include "cc/test/fake_video_frame_provider.h"
  #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 @@
+ #include "cc/test/layer_tree_test.h"
+@@ -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"
 -#include "media/base/media.h"
  #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::_;
 -using media::VideoFrame;
  
  namespace cc {
  namespace {
-@@ -94,7 +90,6 @@ class LayerTreeHostImplTest : public testing::Test,
+@@ -95,7 +91,6 @@ class LayerTreeHostImplTest : public testing::Test,
          reduce_memory_result_(true),
          current_limit_bytes_(0),
          current_priority_cutoff_value_(0) {
 -    media::InitializeMediaLibraryForTesting();
    }
  
    LayerTreeSettings DefaultSettings() {
-@@ -5248,18 +5243,6 @@ TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {
-       LayerImpl::Create(host_impl_->active_tree(), 1);
+@@ -5314,18 +5309,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));
-@@ -6322,16 +6305,6 @@ TEST_F(LayerTreeHostImplTest,
+@@ -6405,16 +6388,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 a343466..eee6275 100644
+index f188260..84210e0 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"
-@@ -4183,28 +4181,6 @@ class LayerInvalidateCausesDraw : public LayerTreeHostTest {
+@@ -4192,28 +4190,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();
@@ skipping 127 matching lines @@
 -  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);