| Index: services/video_capture/test/service_test.cc
|
| diff --git a/services/video_capture/test/service_test.cc b/services/video_capture/test/service_test.cc
|
| index 60f18ce6b155755cfc1a9d7703d384f96ce1c188..eb889a834e442b354f1045945e4e601519c2a377 100644
|
| --- a/services/video_capture/test/service_test.cc
|
| +++ b/services/video_capture/test/service_test.cc
|
| @@ -4,8 +4,19 @@
|
|
|
| #include "services/video_capture/test/service_test.h"
|
|
|
| +#include "services/service_manager/public/interfaces/constants.mojom.h"
|
| +#include "services/service_manager/public/interfaces/service_manager.mojom.h"
|
| +#include "services/video_capture/public/interfaces/constants.mojom.h"
|
| +
|
| namespace video_capture {
|
|
|
| +ServiceManagerListenerImpl::ServiceManagerListenerImpl(
|
| + service_manager::mojom::ServiceManagerListenerRequest request,
|
| + base::RunLoop* loop)
|
| + : binding_(this, std::move(request)), loop_(loop) {}
|
| +
|
| +ServiceManagerListenerImpl::~ServiceManagerListenerImpl() = default;
|
| +
|
| ServiceTest::ServiceTest()
|
| : service_manager::test::ServiceTest("video_capture_unittests") {}
|
|
|
| @@ -13,7 +24,19 @@ ServiceTest::~ServiceTest() = default;
|
|
|
| void ServiceTest::SetUp() {
|
| service_manager::test::ServiceTest::SetUp();
|
| - connector()->BindInterface("video_capture", &service_);
|
| +
|
| + service_manager::mojom::ServiceManagerPtr service_manager;
|
| + connector()->BindInterface(service_manager::mojom::kServiceName,
|
| + &service_manager);
|
| + service_manager::mojom::ServiceManagerListenerPtr listener;
|
| + base::RunLoop loop;
|
| + service_state_observer_ = base::MakeUnique<ServiceManagerListenerImpl>(
|
| + mojo::MakeRequest(&listener), &loop);
|
| + service_manager->AddListener(std::move(listener));
|
| + loop.Run();
|
| +
|
| + connector()->BindInterface(mojom::kServiceName, &service_);
|
| + service_->SetShutdownDelayInSeconds(0.0f);
|
| service_->ConnectToFakeDeviceFactory(mojo::MakeRequest(&factory_));
|
| }
|
|
|
|
|