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

Unified Diff: content/renderer/media/video_capture_impl_unittest.cc

Issue 10108009: Move VideoCapture::VideoCaptureCapability to video_capture_types.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 8 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/renderer/media/video_capture_impl_unittest.cc
diff --git a/content/renderer/media/video_capture_impl_unittest.cc b/content/renderer/media/video_capture_impl_unittest.cc
index 2297886c603a144d67da51a340600f128af03b4e..818ad00d62e1b34dfb958a7b4809506a9e5da04a 100644
--- a/content/renderer/media/video_capture_impl_unittest.cc
+++ b/content/renderer/media/video_capture_impl_unittest.cc
@@ -130,7 +130,7 @@ class VideoCaptureImplTest : public ::testing::Test {
TEST_F(VideoCaptureImplTest, Simple) {
// Execute SetCapture() and StopCapture() for one client.
scoped_ptr<MockVideoCaptureClient> client(new MockVideoCaptureClient);
- media::VideoCapture::VideoCaptureCapability capability =
+ media::VideoCaptureCapability capability =
scherkus (not reviewing) 2012/04/17 17:39:23 nit: this can fit on one line
CAPABILITY_SMALL;
EXPECT_CALL(*client, OnStarted(_))
@@ -153,7 +153,7 @@ TEST_F(VideoCaptureImplTest, Simple) {
TEST_F(VideoCaptureImplTest, TwoClientsInSequence) {
// Execute SetCapture() and StopCapture() for 2 clients in sequence.
scoped_ptr<MockVideoCaptureClient> client(new MockVideoCaptureClient);
- media::VideoCapture::VideoCaptureCapability capability =
+ media::VideoCaptureCapability capability =
scherkus (not reviewing) 2012/04/17 17:39:23 nit: this can fit on one line
CAPABILITY_SMALL;
EXPECT_CALL(*client, OnStarted(_))
@@ -194,9 +194,9 @@ TEST_F(VideoCaptureImplTest, LargeAndSmall) {
// The large client starts first and stops first.
scoped_ptr<MockVideoCaptureClient> client_small(new MockVideoCaptureClient);
scoped_ptr<MockVideoCaptureClient> client_large(new MockVideoCaptureClient);
- media::VideoCapture::VideoCaptureCapability capability_small =
+ media::VideoCaptureCapability capability_small =
scherkus (not reviewing) 2012/04/17 17:39:23 nit: this can fit on one line
CAPABILITY_SMALL;
- media::VideoCapture::VideoCaptureCapability capability_large =
+ media::VideoCaptureCapability capability_large =
scherkus (not reviewing) 2012/04/17 17:39:23 nit: this can fit on one line
CAPABILITY_LARGE;
EXPECT_CALL(*client_large, OnStarted(_))
@@ -231,9 +231,9 @@ TEST_F(VideoCaptureImplTest, SmallAndLarge) {
// The small client starts first and stops first.
scoped_ptr<MockVideoCaptureClient> client_small(new MockVideoCaptureClient);
scoped_ptr<MockVideoCaptureClient> client_large(new MockVideoCaptureClient);
- media::VideoCapture::VideoCaptureCapability capability_small =
+ media::VideoCaptureCapability capability_small =
scherkus (not reviewing) 2012/04/17 17:39:23 ditto for these two
CAPABILITY_SMALL;
- media::VideoCapture::VideoCaptureCapability capability_large =
+ media::VideoCaptureCapability capability_large =
CAPABILITY_LARGE;
EXPECT_CALL(*client_large, OnStarted(_))
@@ -269,7 +269,7 @@ TEST_F(VideoCaptureImplTest, TwoClientsWithSameSize) {
// The client1 starts first and stops first.
scoped_ptr<MockVideoCaptureClient> client1(new MockVideoCaptureClient);
scoped_ptr<MockVideoCaptureClient> client2(new MockVideoCaptureClient);
- media::VideoCapture::VideoCaptureCapability capability = CAPABILITY_SMALL;
+ media::VideoCaptureCapability capability = CAPABILITY_SMALL;
EXPECT_CALL(*client1, OnStarted(_))
.WillOnce(Return());

Powered by Google App Engine
This is Rietveld 408576698