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

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

Issue 2578893003: Converts chrome to aura-mus (Closed)
Patch Set: merge again Created 4 years 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/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 324f99248770c828fbf7f6c67689df430e2975ba..52c1055ff68f41914c72b1212aca51ac738c8179 100644
--- a/chrome/test/base/mash_browser_tests_main.cc
+++ b/chrome/test/base/mash_browser_tests_main.cc
@@ -17,6 +17,7 @@
#include "chrome/test/base/chrome_test_launcher.h"
#include "chrome/test/base/chrome_test_suite.h"
#include "chrome/test/base/mojo_test_connector.h"
+#include "content/public/app/content_main.h"
#include "content/public/common/service_manager_connection.h"
#include "content/public/test/test_launcher.h"
#include "mash/package/mash_packaged_service.h"
@@ -27,6 +28,7 @@
#include "services/service_manager/public/cpp/standalone_service/standalone_service.h"
#include "services/service_manager/runner/common/switches.h"
#include "services/service_manager/runner/init.h"
+#include "ui/aura/env.h"
namespace {
@@ -77,6 +79,7 @@ class MashTestLauncherDelegate : public ChromeTestLauncherDelegate {
// ChromeTestLauncherDelegate:
int RunTestSuite(int argc, char** argv) override {
test_suite_.reset(new MashTestSuite(argc, argv));
+ content::GetContentMainParams()->env_mode = aura::Env::Mode::MUS;
const int result = test_suite_->Run();
test_suite_.reset();
return result;

Powered by Google App Engine
This is Rietveld 408576698