| Index: services/service_manager/public/cpp/lib/service_test.cc
|
| diff --git a/services/service_manager/public/cpp/lib/service_test.cc b/services/service_manager/public/cpp/lib/service_test.cc
|
| index 054c8a8992b8321b1a3074910fbb450aa25c8002..603393d6daa583815a7af88848bb8c7db47efbe2 100644
|
| --- a/services/service_manager/public/cpp/lib/service_test.cc
|
| +++ b/services/service_manager/public/cpp/lib/service_test.cc
|
| @@ -31,8 +31,8 @@ bool ServiceTestClient::OnConnect(const ServiceInfo& remote_info,
|
|
|
| ServiceTest::ServiceTest() {}
|
|
|
| -ServiceTest::ServiceTest(const std::string& test_name, bool init_edk)
|
| - : test_name_(test_name), init_edk_(init_edk) {}
|
| +ServiceTest::ServiceTest(const std::string& test_name)
|
| + : test_name_(test_name) {}
|
|
|
| ServiceTest::~ServiceTest() {}
|
|
|
| @@ -63,7 +63,10 @@ void ServiceTest::SetUp() {
|
| background_service_manager_.reset(
|
| new service_manager::BackgroundServiceManager);
|
| auto init_params = base::MakeUnique<BackgroundServiceManager::InitParams>();
|
| - init_params->init_edk = init_edk_;
|
| + // Because this is testing utility, so expect Mojo is initialized in
|
| + // testing framework already. Thus, do not initialize mojo edk in
|
| + // BackgroundServiceManager.
|
| + init_params->init_edk = false;
|
| background_service_manager_->Init(std::move(init_params));
|
|
|
| // Create the service manager connection. We don't proceed until we get our
|
|
|