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

Unified Diff: ash/test/ash_test_base.cc

Issue 2692663002: Gut ash::MaterialDesignController, and remove the about:flags entry. (Closed)
Patch Set: terry review Created 3 years, 10 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: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 69f5942326fbf8f95df9bdba0d020424058cba8f..c3dde233aae96220911d463116d46a773d7e2588 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -89,10 +89,7 @@ class AshEventGeneratorDelegate
/////////////////////////////////////////////////////////////////////////////
AshTestBase::AshTestBase()
- : setup_called_(false),
- teardown_called_(false),
- start_session_(true),
- material_mode_(MaterialDesignController::Mode::UNINITIALIZED) {
+ : setup_called_(false), teardown_called_(false), start_session_(true) {
#if defined(USE_X11)
// This is needed for tests which use this base class but are run in browser
// test binaries so don't get the default initialization in the unit test
@@ -130,7 +127,7 @@ void AshTestBase::SetUp() {
"1+1-800x600");
}
- ash_test_helper_->SetUp(start_session_, material_mode_);
+ ash_test_helper_->SetUp(start_session_);
Shell::GetPrimaryRootWindow()->Show();
Shell::GetPrimaryRootWindow()->GetHost()->Show();

Powered by Google App Engine
This is Rietveld 408576698