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

Unified Diff: chrome/test/base/mash_browser_tests_main.cc

Issue 2858103002: Have mash_browser_tests recreate BackgroundServiceManager per test (Closed)
Patch Set: Rebase Created 3 years, 7 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
« no previous file with comments | « chrome/test/base/chrome_test_launcher.cc ('k') | chrome/test/base/mojo_test_connector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/mash_browser_tests_main.cc
diff --git a/chrome/test/base/mash_browser_tests_main.cc b/chrome/test/base/mash_browser_tests_main.cc
index 7ff38d4fd633e3d6b355ee7db7ec34899f622635..e5e68a0abbee5b951f20074b905287c064264511 100644
--- a/chrome/test/base/mash_browser_tests_main.cc
+++ b/chrome/test/base/mash_browser_tests_main.cc
@@ -153,9 +153,11 @@ class MashTestLauncherDelegate : public ChromeTestLauncherDelegate {
std::unique_ptr<content::ServiceManagerConnection>
CreateServiceManagerConnection(MashTestLauncherDelegate* delegate) {
+ delegate->GetMojoTestConnectorForSingleProcess()->Init();
std::unique_ptr<content::ServiceManagerConnection> connection(
content::ServiceManagerConnection::Create(
- delegate->GetMojoTestConnectorForSingleProcess()->Init(),
+ delegate->GetMojoTestConnectorForSingleProcess()
+ ->InitBackgroundServiceManager(),
base::ThreadTaskRunnerHandle::Get()));
connection->Start();
connection->GetConnector()->StartService(mash::session::mojom::kServiceName);
« no previous file with comments | « chrome/test/base/chrome_test_launcher.cc ('k') | chrome/test/base/mojo_test_connector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698