Set Ash material design mode in tests properly

ash/wm/overview/window_selector_unittest.cc

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 b30fd27a0f65cc2c7fdf7175751575cf649a28b7..eede2ea0c2b1d2d3fcda4936fa88a00b6978c3af 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);
 };