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

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

Issue 11339014: Move content\browser\renderer_host\media to content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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_controller_unittest.cc
===================================================================
--- content/browser/renderer_host/media/video_capture_controller_unittest.cc (revision 164646)
+++ content/browser/renderer_host/media/video_capture_controller_unittest.cc (working copy)
@@ -26,9 +26,9 @@
using ::testing::AtLeast;
using ::testing::InSequence;
using ::testing::Return;
-using content::BrowserThread;
-using content::BrowserThreadImpl;
+namespace content {
+
enum { kDeviceId = 1 };
ACTION_P4(StopCapture, controller, controller_id, controller_handler,
@@ -97,8 +97,7 @@
base::ProcessHandle process_handle_;
};
-class MockVideoCaptureManager
- : public media_stream::VideoCaptureManager {
+class MockVideoCaptureManager : public VideoCaptureManager {
public:
MockVideoCaptureManager()
: video_session_id_(kStartOpenSessionId) {}
@@ -265,3 +264,5 @@
controller_->StopCapture(controller_handler_->controller_id_,
controller_handler_.get());
}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698