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

Unified Diff: ash/wm/overview/window_selector_unittest.cc

Issue 2186363002: Set Ash material design mode in tests properly (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed compile errors after rebase Created 4 years, 5 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/wm/overview/window_selector_unittest.cc
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
index 4ea2a87e1a882a3d269eb8a6d1efff1baa55364b..eef26a99ba832d49b968073d1bafb0a3afbecbfc 100644
--- a/ash/wm/overview/window_selector_unittest.cc
+++ b/ash/wm/overview/window_selector_unittest.cc
@@ -113,9 +113,8 @@ class WindowSelectorTest
~WindowSelectorTest() override {}
void SetUp() override {
+ set_material_mode(GetParam());
test::AshTestBase::SetUp();
- material_design_state_.reset(
- new test::MaterialDesignControllerTestAPI(GetParam()));
if (!ash::MaterialDesignController::IsOverviewMaterial()) {
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAshEnableStableOverviewOrder);
@@ -128,11 +127,6 @@ class WindowSelectorTest
ScopedTransformOverviewWindow::SetImmediateCloseForTests();
}
- void TearDown() override {
- material_design_state_.reset();
- test::AshTestBase::TearDown();
- }
-
aura::Window* CreateWindow(const gfx::Rect& bounds) {
return CreateTestWindowInShellWithDelegate(&delegate_, -1, bounds);
}
@@ -339,7 +333,6 @@ class WindowSelectorTest
aura::test::TestWindowDelegate delegate_;
NonActivatableActivationDelegate non_activatable_activation_delegate_;
std::unique_ptr<test::ShelfViewTestAPI> shelf_view_test_;
- std::unique_ptr<test::MaterialDesignControllerTestAPI> material_design_state_;
DISALLOW_COPY_AND_ASSIGN(WindowSelectorTest);
};

Powered by Google App Engine
This is Rietveld 408576698