Hook up EncodedVideoSource on the browser side

content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc

Index: content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc b/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
index 26e38c1906e4d70de2f1f5e23ee2597ce8213a7a..fde7a8ef49623cc564cecaab7f44bf9a14226b64 100644
--- a/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
+++ b/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
@@ -26,6 +26,7 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "content/test/test_web_contents.h"
+#include "media/base/encoded_bitstream_buffer.h"
 #include "media/base/video_util.h"
 #include "media/base/yuv_convert.h"
 #include "media/video/capture/video_capture_types.h"
@@ -356,12 +357,17 @@ class StubConsumer : public media::VideoCaptureDevice::EventHandler {
     return error_encountered_;
   }
 
-  virtual scoped_refptr<media::VideoFrame> ReserveOutputBuffer() OVERRIDE {
+  virtual scoped_refptr<media::VideoFrame> ReserveOutputVideoFrame() OVERRIDE {
     return VideoCaptureController::ReserveI420VideoFrame(
         buffer_pool_,
         gfx::Size(kTestWidth, kTestHeight));
   }
 
+  virtual scoped_refptr<media::EncodedBitstreamBuffer>
+  ReserveOutputEncodedBitstreamBuffer() OVERRIDE {
+    return NULL;
+  }
+
   virtual void OnIncomingCapturedFrame(
       const uint8* data,
       int length,
@@ -390,6 +396,12 @@ class StubConsumer : public media::VideoCaptureDevice::EventHandler {
     PostColorOrError(SkColorSetRGB(yuv[0], yuv[1], yuv[2]));
   }
 
+  virtual void OnIncomingCapturedEncodedBitstreamBuffer(
+      const scoped_refptr<media::EncodedBitstreamBuffer>& buffer,
+      size_t data_size,
+      base::Time timestamp) OVERRIDE {
+  }

[Ami GONE FROM CHROMIUM, 2013/06/18 18:35:55]

NOTREACHED?
What about actually testing this codepath?

[sheu, 2013/08/22 22:40:31]

NOTREACHED() them.

Testing this codepath is unnecessary until encoded tab capture is implemented.

+
   void PostColorOrError(SkColor new_color) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
         &StubConsumer::QuitIfConditionMet, base::Unretained(this), new_color));
@@ -410,6 +422,14 @@ class StubConsumer : public media::VideoCaptureDevice::EventHandler {
     EXPECT_EQ(media::VideoCaptureCapability::kI420, info.color);
   }
 
+  virtual void OnEncodedFrameInfo(
+      const media::VideoEncodingParameters& params) OVERRIDE {
+  }
+
+  virtual void OnBitstreamConfigChanged(
+      const media::RuntimeVideoEncodingParameters& params) OVERRIDE {
+  }
+
  private:
   base::Lock lock_;
   bool error_encountered_;