Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type.

content/browser/renderer_host/media/video_capture_controller_unittest.cc

 // 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.
 
 // Unit test for VideoCaptureController.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 115 matching lines @@
     client_a_.reset(new MockVideoCaptureControllerEventHandler(
         controller_.get()));
     client_b_.reset(new MockVideoCaptureControllerEventHandler(
         controller_.get()));
   }
 
   void TearDown() override { base::RunLoop().RunUntilIdle(); }
 
   scoped_refptr<media::VideoFrame> WrapI420Buffer(gfx::Size dimensions,
                                                   uint8* data) {
-    return media::VideoFrame::WrapExternalPackedMemory(
+    return media::VideoFrame::WrapExternalData(
         media::VideoFrame::I420,
         dimensions,
         gfx::Rect(dimensions),
         dimensions,
         data,
         media::VideoFrame::AllocationSize(media::VideoFrame::I420, dimensions),
-        base::SharedMemory::NULLHandle(),
-        0,
         base::TimeDelta());
   }
 
   scoped_refptr<media::VideoFrame> WrapMailboxBuffer(
       const gpu::MailboxHolder& holder,
       const media::VideoFrame::ReleaseMailboxCB& release_cb,
       gfx::Size dimensions) {
     return media::VideoFrame::WrapNativeTexture(
         holder, release_cb, dimensions, gfx::Rect(dimensions), dimensions,
         base::TimeDelta(), false /* allow_overlay */, true /* has_alpha */);
@@ skipping 545 matching lines @@
     EXPECT_EQ(coded_size.width(), size_and_rotation.output_resolution.width());
     EXPECT_EQ(coded_size.height(),
               size_and_rotation.output_resolution.height());
 
     EXPECT_EQ(kSessionId, controller_->RemoveClient(route_id, client_a_.get()));
     Mock::VerifyAndClearExpectations(client_a_.get());
   }
 }
 
 }  // namespace content