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

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

Issue 1017503002: VideoCaptureHost/VideoCaptureControllerEventHandler cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unneeded BindToCurrentLoop() Created 5 years, 9 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_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 ca8e7a48adb075ddba09bd6a5581365ba5947464..41fcc2c262aedb26d812324beb2f5f9c3ff0c837 100644
--- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
@@ -44,31 +44,31 @@ class MockVideoCaptureControllerEventHandler
// These mock methods are delegated to by our fake implementation of
// VideoCaptureControllerEventHandler, to be used in EXPECT_CALL().
- MOCK_METHOD1(DoBufferCreated, void(const VideoCaptureControllerID&));
- MOCK_METHOD1(DoBufferDestroyed, void(const VideoCaptureControllerID&));
- MOCK_METHOD1(DoBufferReady, void(const VideoCaptureControllerID&));
- MOCK_METHOD1(DoMailboxBufferReady, void(const VideoCaptureControllerID&));
- MOCK_METHOD1(DoEnded, void(const VideoCaptureControllerID&));
- MOCK_METHOD1(DoError, void(const VideoCaptureControllerID&));
-
- virtual void OnError(const VideoCaptureControllerID& id) override {
+ MOCK_METHOD1(DoBufferCreated, void(VideoCaptureControllerID));
+ MOCK_METHOD1(DoBufferDestroyed, void(VideoCaptureControllerID));
+ MOCK_METHOD1(DoBufferReady, void(VideoCaptureControllerID));
+ MOCK_METHOD1(DoMailboxBufferReady, void(VideoCaptureControllerID));
+ MOCK_METHOD1(DoEnded, void(VideoCaptureControllerID));
+ MOCK_METHOD1(DoError, void(VideoCaptureControllerID));
+
+ virtual void OnError(VideoCaptureControllerID id) override {
DoError(id);
}
- virtual void OnBufferCreated(const VideoCaptureControllerID& id,
+ virtual void OnBufferCreated(VideoCaptureControllerID id,
base::SharedMemoryHandle handle,
int length, int buffer_id) override {
DoBufferCreated(id);
}
- virtual void OnBufferDestroyed(const VideoCaptureControllerID& id,
+ virtual void OnBufferDestroyed(VideoCaptureControllerID id,
int buffer_id) override {
DoBufferDestroyed(id);
}
virtual void OnBufferReady(
- const VideoCaptureControllerID& id,
+ VideoCaptureControllerID id,
int buffer_id,
const gfx::Size& coded_size,
const gfx::Rect& visible_rect,
- base::TimeTicks timestamp,
+ const base::TimeTicks& timestamp,
scoped_ptr<base::DictionaryValue> metadata) override {
DoBufferReady(id);
base::MessageLoop::current()->PostTask(
@@ -81,11 +81,11 @@ class MockVideoCaptureControllerEventHandler
0));
}
virtual void OnMailboxBufferReady(
- const VideoCaptureControllerID& id,
+ VideoCaptureControllerID id,
int buffer_id,
const gpu::MailboxHolder& mailbox_holder,
const gfx::Size& packed_frame_size,
- base::TimeTicks timestamp,
+ const base::TimeTicks& timestamp,
scoped_ptr<base::DictionaryValue> metadata) override {
DoMailboxBufferReady(id);
base::MessageLoop::current()->PostTask(
@@ -97,7 +97,7 @@ class MockVideoCaptureControllerEventHandler
buffer_id,
mailbox_holder.sync_point));
}
- virtual void OnEnded(const VideoCaptureControllerID& id) override {
+ virtual void OnEnded(VideoCaptureControllerID id) override {
DoEnded(id);
// OnEnded() must respond by (eventually) unregistering the client.
base::MessageLoop::current()->PostTask(FROM_HERE,

Powered by Google App Engine
This is Rietveld 408576698