Gut ash::MaterialDesignController, and remove the about:flags entry.

ash/test/ash_test_helper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/test/ash_test_helper.h"
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
-#include "ash/common/material_design/material_design_controller.h"
-#include "ash/common/test/material_design_controller_test_api.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/test/wm_shell_test_api.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
 #include "ash/system/chromeos/screen_layout_observer.h"
 #include "ash/test/ash_test_environment.h"
 #include "ash/test/ash_test_views_delegate.h"
 #include "ash/test/shell_test_api.h"
@@ skipping 30 matching lines @@
       test_shell_delegate_(nullptr),
       test_screenshot_delegate_(nullptr),
       dbus_thread_manager_initialized_(false),
       bluez_dbus_manager_initialized_(false) {
   ui::test::EnableTestConfigForPlatformWindows();
   aura::test::InitializeAuraEventGeneratorDelegate();
 }
 
 AshTestHelper::~AshTestHelper() {}
 
-void AshTestHelper::SetUp(bool start_session,
-                          MaterialDesignController::Mode material_mode) {
+void AshTestHelper::SetUp(bool start_session) {
   display::ResetDisplayIdForTest();
   wm_state_ = base::MakeUnique<::wm::WMState>();
   views_delegate_ = ash_test_environment_->CreateViewsDelegate();
 
   // Disable animations during tests.
   zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
   ui::InitializeInputMethodForTesting();
 
   bool enable_pixel_output = false;
@@ skipping 30 matching lines @@
 
   ash_test_environment_->SetUp();
   // Reset the global state for the cursor manager. This includes the
   // last cursor visibility state, etc.
   ::wm::CursorManager::ResetCursorVisibilityStateForTest();
 
   // ContentTestSuiteBase might have already initialized
   // MaterialDesignController in unit_tests suite.
   ui::test::MaterialDesignControllerTestAPI::Uninitialize();
   ui::MaterialDesignController::Initialize();
-  ash::MaterialDesignController::Initialize();
-  if (material_mode == MaterialDesignController::Mode::UNINITIALIZED)
-    material_mode = MaterialDesignController::GetMode();
-  material_design_state_.reset(
-      new test::MaterialDesignControllerTestAPI(material_mode));
 
   ShellInitParams init_params;
   init_params.delegate = test_shell_delegate_;
   init_params.context_factory = context_factory;
   init_params.context_factory_private = context_factory_private;
   init_params.blocking_pool = ash_test_environment_->GetBlockingPool();
   Shell::CreateInstance(init_params);
   aura::test::EnvTestHelper(aura::Env::GetInstance())
       .SetInputStateLookup(std::unique_ptr<aura::InputStateLookup>());
 
@@ skipping 16 matching lines @@
       std::unique_ptr<ScreenshotDelegate>(test_screenshot_delegate_));
 }
 
 void AshTestHelper::TearDown() {
   // Tear down the shell.
   Shell::DeleteInstance();
 
   // Suspend the tear down until all resources are returned via
   // MojoCompositorFrameSinkClient::ReclaimResources()
   RunAllPendingInMessageLoop();
-  material_design_state_.reset();
-  test::MaterialDesignControllerTestAPI::Uninitialize();
   ash_test_environment_->TearDown();
 
   test_screenshot_delegate_ = NULL;
 
   // Remove global message center state.
   message_center::MessageCenter::Shutdown();
 
   chromeos::CrasAudioHandler::Shutdown();
   if (bluez_dbus_manager_initialized_) {
     device::BluetoothAdapterFactory::Shutdown();
@@ skipping 31 matching lines @@
 aura::Window* AshTestHelper::CurrentContext() {
   aura::Window* root_window = Shell::GetTargetRootWindow();
   if (!root_window)
     root_window = Shell::GetPrimaryRootWindow();
   DCHECK(root_window);
   return root_window;
 }
 
 }  // namespace test
 }  // namespace ash