| 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 3bd57a6a582b0343906ef5b14082b9c420317e92..9c7b639e49496ea3fa6105fb1aa65aa9bf52191d 100644
|
| --- a/chrome/test/base/chrome_test_launcher.cc
|
| +++ b/chrome/test/base/chrome_test_launcher.cc
|
| @@ -30,6 +30,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)
|
| @@ -63,6 +64,12 @@ ChromeTestSuiteRunner::ChromeTestSuiteRunner() {}
|
| ChromeTestSuiteRunner::~ChromeTestSuiteRunner() {}
|
|
|
| int ChromeTestSuiteRunner::RunTestSuite(int argc, char** argv) {
|
| +#if defined(USE_AURA)
|
| + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| + if (command_line->HasSwitch(service_manager::switches::kServicePipeToken))
|
| + content::GetContentMainParams()->env_mode = aura::Env::Mode::MUS;
|
| +#endif // defined(USE_AURA)
|
| +
|
| return ChromeTestSuite(argc, argv).Run();
|
| }
|
|
|
|
|