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

Unified Diff: services/video_capture/mock_device_factory.h

Issue 2502483003: [Mojo Video Capture] Cleanup naming of classes/files in services/video_capture (Closed)
Patch Set: Rebase Created 4 years, 1 month 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 | « services/video_capture/fake_device_unittest.cc ('k') | services/video_capture/mock_device_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/video_capture/mock_device_factory.h
diff --git a/services/video_capture/mock_device_factory.h b/services/video_capture/mock_device_factory.h
index b9d760f38e7395e22c9d78e8e2b6728805bf6d56..598e7f9bcdb473f3d6c2c7dbad62e5f5e2c5cdbc 100644
--- a/services/video_capture/mock_device_factory.h
+++ b/services/video_capture/mock_device_factory.h
@@ -9,9 +9,9 @@
#include "media/capture/video/video_capture_device_factory.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/video_capture/public/interfaces/mock_video_capture_device.mojom.h"
-#include "services/video_capture/public/interfaces/video_capture_device_descriptor.mojom.h"
-#include "services/video_capture/video_capture_device_proxy_impl.h"
+#include "services/video_capture/device_media_to_mojo_adapter.h"
+#include "services/video_capture/public/interfaces/device_descriptor.mojom.h"
+#include "services/video_capture/public/interfaces/mock_device.mojom.h"
namespace video_capture {
@@ -22,7 +22,7 @@ class MockDeviceFactory : public media::VideoCaptureDeviceFactory {
MockDeviceFactory();
~MockDeviceFactory() override;
- void AddMockDevice(mojom::MockVideoCaptureDevicePtr device,
+ void AddMockDevice(mojom::MockMediaDevicePtr device,
const media::VideoCaptureDeviceDescriptor& descriptor);
// media::VideoCaptureDeviceFactory:
@@ -35,8 +35,7 @@ class MockDeviceFactory : public media::VideoCaptureDeviceFactory {
media::VideoCaptureFormats* supported_formats) override;
private:
- std::map<media::VideoCaptureDeviceDescriptor,
- mojom::MockVideoCaptureDevicePtr>
+ std::map<media::VideoCaptureDeviceDescriptor, mojom::MockMediaDevicePtr>
devices_;
};
« no previous file with comments | « services/video_capture/fake_device_unittest.cc ('k') | services/video_capture/mock_device_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698