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

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

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « content/browser/renderer_host/media/video_capture_manager.cc ('k') | content/common/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/video_capture_manager_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
index c2cc9c700711e08b7782fa6940280dc10261d7bc..bbda17a69295272b1e80c2b889f1f763451ccffc 100644
--- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
@@ -19,7 +19,7 @@
#include "content/browser/renderer_host/media/media_stream_provider.h"
#include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
#include "content/common/media/media_stream_options.h"
-#include "media/capture/video/fake_video_capture_device_factory.h"
+#include "device/capture/video/fake_video_capture_device_factory.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -82,10 +82,10 @@ class VideoCaptureManagerTest : public testing::Test {
io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
message_loop_.get()));
vcm_ = new VideoCaptureManager(
- std::unique_ptr<media::VideoCaptureDeviceFactory>(
- new media::FakeVideoCaptureDeviceFactory()));
+ std::unique_ptr<device::VideoCaptureDeviceFactory>(
+ new device::FakeVideoCaptureDeviceFactory()));
video_capture_device_factory_ =
- static_cast<media::FakeVideoCaptureDeviceFactory*>(
+ static_cast<device::FakeVideoCaptureDeviceFactory*>(
vcm_->video_capture_device_factory());
const int32_t kNumberOfFakeDevices = 2;
video_capture_device_factory_->set_number_of_devices(kNumberOfFakeDevices);
@@ -173,7 +173,7 @@ class VideoCaptureManagerTest : public testing::Test {
std::unique_ptr<BrowserThreadImpl> ui_thread_;
std::unique_ptr<BrowserThreadImpl> io_thread_;
std::unique_ptr<MockFrameObserver> frame_observer_;
- media::FakeVideoCaptureDeviceFactory* video_capture_device_factory_;
+ device::FakeVideoCaptureDeviceFactory* video_capture_device_factory_;
private:
DISALLOW_COPY_AND_ASSIGN(VideoCaptureManagerTest);
« no previous file with comments | « content/browser/renderer_host/media/video_capture_manager.cc ('k') | content/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698