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

Unified Diff: media/video/capture/video_capture_device_unittest.cc

Issue 270263008: Add a ChromeOS implementation of VideoCaptureDevice (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 7 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: media/video/capture/video_capture_device_unittest.cc
diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc
index e897d20454251c80fb25a0f93e1014a50fce36a4..394780dd733257f0d9d9f9ea7097063afbc70708 100644
--- a/media/video/capture/video_capture_device_unittest.cc
+++ b/media/video/capture/video_capture_device_unittest.cc
@@ -4,6 +4,7 @@
#include "base/bind.h"
#include "base/memory/scoped_ptr.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/run_loop.h"
#include "base/test/test_timeouts.h"
#include "base/threading/thread.h"
@@ -175,7 +176,9 @@ TEST_F(VideoCaptureDeviceTest, OpenInvalidDevice) {
VideoCaptureDevice::Name device_name("jibberish", "jibberish");
#endif
scoped_ptr<VideoCaptureDevice> device =
- video_capture_device_factory_->Create(device_name);
+ video_capture_device_factory_->Create(
+ base::MessageLoopProxy::current(),
+ device_name);
EXPECT_TRUE(device == NULL);
}
@@ -187,7 +190,8 @@ TEST_F(VideoCaptureDeviceTest, CaptureVGA) {
}
scoped_ptr<VideoCaptureDevice> device(
- video_capture_device_factory_->Create(names_.front()));
+ video_capture_device_factory_->Create(base::MessageLoopProxy::current(),
+ names_.front()));
ASSERT_TRUE(device);
DVLOG(1) << names_.front().id();
@@ -215,7 +219,8 @@ TEST_F(VideoCaptureDeviceTest, Capture720p) {
}
scoped_ptr<VideoCaptureDevice> device(
- video_capture_device_factory_->Create(names_.front()));
+ video_capture_device_factory_->Create(base::MessageLoopProxy::current(),
+ names_.front()));
ASSERT_TRUE(device);
EXPECT_CALL(*client_, OnErr())
@@ -239,7 +244,8 @@ TEST_F(VideoCaptureDeviceTest, MAYBE_AllocateBadSize) {
return;
}
scoped_ptr<VideoCaptureDevice> device(
- video_capture_device_factory_->Create(names_.front()));
+ video_capture_device_factory_->Create(base::MessageLoopProxy::current(),
+ names_.front()));
ASSERT_TRUE(device);
EXPECT_CALL(*client_, OnErr())
@@ -268,7 +274,8 @@ TEST_F(VideoCaptureDeviceTest, ReAllocateCamera) {
for (int i = 0; i <= 5; i++) {
ResetWithNewClient();
scoped_ptr<VideoCaptureDevice> device(
- video_capture_device_factory_->Create(names_.front()));
+ video_capture_device_factory_->Create(base::MessageLoopProxy::current(),
+ names_.front()));
gfx::Size resolution;
if (i % 2) {
resolution = gfx::Size(640, 480);
@@ -293,7 +300,8 @@ TEST_F(VideoCaptureDeviceTest, ReAllocateCamera) {
ResetWithNewClient();
scoped_ptr<VideoCaptureDevice> device(
- video_capture_device_factory_->Create(names_.front()));
+ video_capture_device_factory_->Create(base::MessageLoopProxy::current(),
+ names_.front()));
device->AllocateAndStart(capture_params, client_.PassAs<Client>());
WaitForCapturedFrame();
@@ -310,7 +318,8 @@ TEST_F(VideoCaptureDeviceTest, DeAllocateCameraWhileRunning) {
return;
}
scoped_ptr<VideoCaptureDevice> device(
- video_capture_device_factory_->Create(names_.front()));
+ video_capture_device_factory_->Create(base::MessageLoopProxy::current(),
+ names_.front()));
ASSERT_TRUE(device);
EXPECT_CALL(*client_, OnErr())
@@ -339,7 +348,8 @@ TEST_F(VideoCaptureDeviceTest, MAYBE_CaptureMjpeg) {
return;
}
scoped_ptr<VideoCaptureDevice> device(
- video_capture_device_factory_->Create(*name));
+ video_capture_device_factory_->Create(base::MessageLoopProxy::current(),
+ *name));
ASSERT_TRUE(device);
EXPECT_CALL(*client_, OnErr())
« no previous file with comments | « media/video/capture/video_capture_device_factory.cc ('k') | media/video/capture/win/video_capture_device_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698