Move VideoCapture::VideoCaptureCapability to video_capture_types.h

content/renderer/media/video_capture_impl_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
 #include "content/common/media/video_capture_messages.h"
 #include "content/renderer/media/video_capture_impl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 112 matching lines @@
   media::VideoCaptureSessionId session_id_;
   MockVideoCaptureImpl* video_capture_impl_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureImplTest);
 };
 
 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(_))
       .WillOnce(Return());
   EXPECT_CALL(*client, OnDeviceInfoReceived(_,_))
       .WillOnce(Return());
 
   video_capture_impl_->StartCapture(client.get(), capability);
   message_loop_->RunAllPending();
 
   EXPECT_CALL(*client, OnStopped(_))
       .WillOnce(Return());
   EXPECT_CALL(*client, OnRemoved(_))
       .WillOnce(Return());
 
   video_capture_impl_->StopCapture(client.get());
   message_loop_->RunAllPending();
 }
 
 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(_))
       .WillOnce(Return());
   EXPECT_CALL(*client, OnDeviceInfoReceived(_,_))
       .WillOnce(Return());
 
   video_capture_impl_->StartCapture(client.get(), capability);
   message_loop_->RunAllPending();
 
@@ skipping 20 matching lines @@
 
   video_capture_impl_->StopCapture(client.get());
   message_loop_->RunAllPending();
 }
 
 TEST_F(VideoCaptureImplTest, LargeAndSmall) {
   // Execute SetCapture() and StopCapture() for 2 clients simultaneously.
   // 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(_))
       .WillOnce(Return());
   EXPECT_CALL(*client_large, OnDeviceInfoReceived(_,_))
       .WillOnce(Return());
   EXPECT_CALL(*client_small, OnStarted(_))
       .WillOnce(Return());
   EXPECT_CALL(*client_small, OnDeviceInfoReceived(_,_))
       .WillOnce(Return());
@@ skipping 14 matching lines @@
   video_capture_impl_->StopCapture(client_large.get());
   video_capture_impl_->StopCapture(client_small.get());
   message_loop_->RunAllPending();
 }
 
 TEST_F(VideoCaptureImplTest, SmallAndLarge) {
   // Execute SetCapture() and StopCapture() for 2 clients simultaneously.
   // 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(_))
       .WillOnce(Return());
   EXPECT_CALL(*client_large, OnDeviceInfoReceived(_,_))
       .WillOnce(Return());
   EXPECT_CALL(*client_small, OnStarted(_))
       .WillOnce(Return());
   EXPECT_CALL(*client_small, OnDeviceInfoReceived(_,_))
       .Times(AtLeast(1))
@@ skipping 15 matching lines @@
   video_capture_impl_->StopCapture(client_small.get());
   video_capture_impl_->StopCapture(client_large.get());
   message_loop_->RunAllPending();
 }
 
 TEST_F(VideoCaptureImplTest, TwoClientsWithSameSize) {
   // Execute SetCapture() and StopCapture() for 2 clients simultaneously.
   // 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());
   EXPECT_CALL(*client1, OnDeviceInfoReceived(_,_))
       .WillOnce(Return());
   EXPECT_CALL(*client2, OnStarted(_))
       .WillOnce(Return());
   EXPECT_CALL(*client2, OnDeviceInfoReceived(_,_))
       .WillOnce(Return());
 
   video_capture_impl_->StartCapture(client1.get(), capability);
   video_capture_impl_->StartCapture(client2.get(), capability);
   message_loop_->RunAllPending();
 
   EXPECT_CALL(*client1, OnStopped(_))
       .WillOnce(Return());
   EXPECT_CALL(*client1, OnRemoved(_))
       .WillOnce(Return());
   EXPECT_CALL(*client2, OnStopped(_))
       .WillOnce(Return());
   EXPECT_CALL(*client2, OnRemoved(_))
       .WillOnce(Return());
 
   video_capture_impl_->StopCapture(client1.get());
   video_capture_impl_->StopCapture(client2.get());
   message_loop_->RunAllPending();
 }