Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Unified Diff: content/browser/renderer_host/media/video_capture_manager_unittest.cc

Issue 23551011: From Video Capture, abolish OnFrameInfo and enable resolution changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix constant declaration issue. Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/video_capture_manager_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
index c794195683aa3197f750c599f9614b6a42609498..dc0bdfe80438b41e2b5d66c85de0741fae256dc2 100644
--- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
@@ -49,18 +49,15 @@ class MockFrameObserver : public VideoCaptureControllerEventHandler {
virtual void OnBufferCreated(const VideoCaptureControllerID& id,
base::SharedMemoryHandle handle,
- int length, int buffer_id) OVERRIDE {};
- virtual void OnBufferReady(const VideoCaptureControllerID& id,
- int buffer_id,
- base::Time timestamp) OVERRIDE {};
- virtual void OnFrameInfo(
+ int length, int buffer_id) OVERRIDE {}
+ virtual void OnBufferDestroyed(const VideoCaptureControllerID& id,
+ int buffer_id) OVERRIDE {}
+ virtual void OnBufferReady(
const VideoCaptureControllerID& id,
- const media::VideoCaptureCapability& format) OVERRIDE {};
- virtual void OnFrameInfoChanged(const VideoCaptureControllerID& id,
- int width,
- int height,
- int frame_rate) OVERRIDE {};
- virtual void OnEnded(const VideoCaptureControllerID& id) OVERRIDE {};
+ int buffer_id,
+ base::Time timestamp,
+ const media::VideoCaptureFormat& format) OVERRIDE {}
+ virtual void OnEnded(const VideoCaptureControllerID& id) OVERRIDE {}
void OnGotControllerCallback(VideoCaptureControllerID) {}
};

Powered by Google App Engine
This is Rietveld 408576698