Remove media::VideoFrame from media::VideoCaptureDevice::Client interface

media/video/capture/video_capture_device_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.
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
@@ skipping 46 matching lines @@
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::Return;
 using ::testing::AtLeast;
 using ::testing::SaveArg;
 
 namespace media {
 
 class MockClient : public media::VideoCaptureDevice::Client {
  public:
-  MOCK_METHOD1(ReserveOutputBuffer,
-      scoped_refptr<media::VideoFrame>(const gfx::Size&));
+  MOCK_METHOD1(
+      ReserveOutputBuffer,
+      scoped_refptr<media::VideoFrame>(media::VideoFrame::Format format,
+                                       const gfx::Size&));
   MOCK_METHOD0(OnErr, void());
   MOCK_METHOD1(OnFrameInfo, void(const VideoCaptureCapability&));
   MOCK_METHOD1(OnFrameInfoChanged, void(const VideoCaptureCapability&));
 
   explicit MockClient(
       base::Closure frame_cb)
       : main_thread_(base::MessageLoopProxy::current()),
         frame_cb_(frame_cb) {}
 
   virtual void OnError() OVERRIDE {
     OnErr();
   }
 
   virtual void OnIncomingCapturedFrame(
       const uint8* data,
       int length,
       base::Time timestamp,
       int rotation,
       bool flip_vert,
       bool flip_horiz) OVERRIDE {
     main_thread_->PostTask(FROM_HERE, frame_cb_);
   }
 
-  virtual void OnIncomingCapturedVideoFrame(
-      const scoped_refptr<media::VideoFrame>& frame,
-      base::Time timestamp) OVERRIDE {
+  virtual void OnIncomingCapturedI420Buffer(scoped_ptr<Buffer> buffer,

[ncarter (slow), 2013/10/29 18:42:17]

This method doesn't seem to match anything in VideoCaptureDevice::Client
interface. Does this compile?

[sheu, 2013/11/05 20:02:10]

Apparently not :-P

I didn't realize I had to build/run media_unittest as well.  All I'd been
running were browser_tests and content_unittest.

+                                            const gfx::Size& dimensions,
+                                            base::Time timestamp) OVERRIDE {
     main_thread_->PostTask(FROM_HERE, frame_cb_);
   }
 
  private:
   scoped_refptr<base::MessageLoopProxy> main_thread_;
   base::Closure frame_cb_;
 };
 
 class VideoCaptureDeviceTest : public testing::Test {
  protected:
@@ skipping 356 matching lines @@
                                                       &capture_formats);
     EXPECT_GE(capture_formats.size(), 1u);
     EXPECT_EQ(capture_formats[0].width, 640);
     EXPECT_EQ(capture_formats[0].height, 480);
     EXPECT_EQ(capture_formats[0].color, media::PIXEL_FORMAT_I420);
     EXPECT_GE(capture_formats[0].frame_rate, 20);
   }
 }
 
 };  // namespace media