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

Unified Diff: services/video_capture/video_capture_service.cc

Issue 2386183002: Replace manual conversions with Mojo type mappings
Patch Set: Created 4 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: services/video_capture/video_capture_service.cc
diff --git a/services/video_capture/video_capture_service.cc b/services/video_capture/video_capture_service.cc
index dce88df0adddb4bfd520e385ec6ad6d8b135a057..3e06a4b3c68f700a740de0fd03fdd8c1ece282db 100644
--- a/services/video_capture/video_capture_service.cc
+++ b/services/video_capture/video_capture_service.cc
@@ -10,7 +10,6 @@
#include "media/capture/video/video_capture_buffer_pool.h"
#include "media/capture/video/video_capture_jpeg_decoder.h"
#include "services/video_capture/device_factory_media_to_mojo_adapter.h"
-#include "services/video_capture/mojo_media_conversions.h"
#include "services/video_capture/mock_device_factory.h"
namespace {
@@ -62,7 +61,7 @@ void VideoCaptureService::ConnectToMockDeviceFactory(
void VideoCaptureService::AddDeviceToMockFactory(
mojom::MockVideoCaptureDevicePtr device,
- mojom::VideoCaptureDeviceDescriptorPtr descriptor,
+ const media::VideoCaptureDeviceDescriptor& descriptor,
const AddDeviceToMockFactoryCallback& callback) {
LazyInitializeMockDeviceFactory();
mock_device_factory_->AddMockDevice(std::move(device), std::move(descriptor));
« no previous file with comments | « services/video_capture/video_capture_service.h ('k') | services/video_capture/video_capture_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698