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

Unified Diff: services/video_capture/test/mock_device_test.h

Issue 2824883005: [Mojo Video Capture] Stop service when last client disconnects. (Closed)
Patch Set: Incorporate suggestions from PatchSet #2 Created 3 years, 8 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/test/mock_device_test.h
diff --git a/services/video_capture/test/mock_device_test.h b/services/video_capture/test/mock_device_test.h
index 637f635fb34df9b5fc33c818e42f626c7cbd15b8..190096692562556c5be20224ff9edf270d4a87f1 100644
--- a/services/video_capture/test/mock_device_test.h
+++ b/services/video_capture/test/mock_device_test.h
@@ -7,8 +7,9 @@
#include "base/test/mock_callback.h"
#include "media/capture/video/video_capture_device.h"
+#include "services/service_manager/public/cpp/service_context_ref.h"
#include "services/video_capture/device_factory_media_to_mojo_adapter.h"
-#include "services/video_capture/public/interfaces/service.mojom.h"
+#include "services/video_capture/public/interfaces/device_factory_provider.mojom.h"
#include "services/video_capture/test/mock_device_factory.h"
#include "services/video_capture/test/mock_receiver.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -29,9 +30,9 @@ class MockDevice : public media::VideoCaptureDevice {
void SendStubFrame(const media::VideoCaptureFormat& format,
int rotation,
- int frame_id);
+ int frame_feedback_id);
- // media::VideoCaptureDevice:
+ // media::VideoCaptureDevice implementation.
MOCK_METHOD2(DoAllocateAndStart,
void(const media::VideoCaptureParams& params,
std::unique_ptr<Client>* client));
@@ -83,6 +84,7 @@ class MockDeviceTest : public ::testing::Test {
private:
std::unique_ptr<base::MessageLoop> message_loop_;
mcasas 2017/04/27 20:10:02 In subsequent CLs we should remove MessageLoop in
chfremer 2017/04/27 23:48:14 Acknowledged.
+ service_manager::ServiceContextRefFactory ref_factory_;
};
} // namespace video_capture

Powered by Google App Engine
This is Rietveld 408576698