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

Unified Diff: services/service_manager/public/cpp/lib/service_test.cc

Issue 2617713002: [WIP] Add DCHECK for mojo::edk::Init().
Patch Set: test Created 3 years, 11 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/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

Powered by Google App Engine
This is Rietveld 408576698