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

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

Issue 2858103002: Have mash_browser_tests recreate BackgroundServiceManager per test (Closed)
Patch Set: Disable broken tests 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
Index: chrome/test/base/chrome_test_launcher.cc
diff --git a/chrome/test/base/chrome_test_launcher.cc b/chrome/test/base/chrome_test_launcher.cc
index a6e39530d5e307530e1de9bd951a0a9369f1db67..1a53760bfe02ff837d65d47277976a7b42542e99 100644
--- a/chrome/test/base/chrome_test_launcher.cc
+++ b/chrome/test/base/chrome_test_launcher.cc
@@ -29,6 +29,7 @@
#include "content/public/common/content_switches.h"
#include "content/public/test/test_launcher.h"
#include "content/public/test/test_utils.h"
+#include "services/service_manager/runner/common/switches.h"
#include "ui/base/test/ui_controls.h"
#if defined(OS_MACOSX)
@@ -59,6 +60,10 @@ ChromeTestSuiteRunner::ChromeTestSuiteRunner() {}
ChromeTestSuiteRunner::~ChromeTestSuiteRunner() {}
int ChromeTestSuiteRunner::RunTestSuite(int argc, char** argv) {
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+ if (command_line->HasSwitch(service_manager::switches::kServicePipeToken))
+ content::GetContentMainParams()->env_mode = aura::Env::Mode::MUS;
+
return ChromeTestSuite(argc, argv).Run();
}
« no previous file with comments | « no previous file | chrome/test/base/mash_browser_tests_main.cc » ('j') | chrome/test/base/mash_browser_tests_main.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698