media: Let VideoFrame carry more than one native texture.

content/browser/renderer_host/media/video_capture_controller_unittest.cc

Index: content/browser/renderer_host/media/video_capture_controller_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
index 24f20737aae427e5d41b3aac38f35b956d76eb69..fe3ff61921a6e9b74108a3d7fe28458370e37fa0 100644
--- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
@@ -147,12 +147,12 @@ class VideoCaptureControllerTest : public testing::Test {
   }
 
   scoped_refptr<media::VideoFrame> WrapMailboxBuffer(
-      scoped_ptr<gpu::MailboxHolder> holder,
+      const gpu::MailboxHolder& holder,
       const media::VideoFrame::ReleaseMailboxCB& release_cb,
       gfx::Size dimensions) {
     return media::VideoFrame::WrapNativeTexture(
-        holder.Pass(), release_cb, dimensions, gfx::Rect(dimensions),
-        dimensions, base::TimeDelta(), false);
+        holder, release_cb, dimensions, gfx::Rect(dimensions), dimensions,
+        base::TimeDelta(), false);
   }
 
   TestBrowserThreadBundle bundle_;
@@ -488,10 +488,10 @@ TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {
 #endif
     device_->OnIncomingCapturedVideoFrame(
         buffer.Pass(),
-        WrapMailboxBuffer(make_scoped_ptr(new gpu::MailboxHolder(
-                              gpu::Mailbox(), 0, mailbox_syncpoints[i])),
-                          base::Bind(&CacheSyncPoint, &release_syncpoints[i]),
-                          capture_resolution),
+        WrapMailboxBuffer(
+            gpu::MailboxHolder(gpu::Mailbox(), 0, mailbox_syncpoints[i]),
+            base::Bind(&CacheSyncPoint, &release_syncpoints[i]),
+            capture_resolution),
         base::TimeTicks());
   }
   // ReserveOutputBuffers ought to fail now regardless of buffer format, because