Revert of Makes MaterialDesignController initialization explicit

ui/aura/test/aura_test_base.cc

 // Copyright (c) 2012 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 "ui/aura/test/aura_test_base.h"
 
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/test/aura_test_helper.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/base/ime/input_method_initializer.h"
-#include "ui/base/material_design/material_design_controller.h"
-#include "ui/base/test/material_design_controller_test_api.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/events/event_dispatcher.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 
 namespace aura {
 namespace test {
 
 AuraTestBase::AuraTestBase()
     : setup_called_(false),
       teardown_called_(false) {
 }
 
 AuraTestBase::~AuraTestBase() {
   CHECK(setup_called_)
       << "You have overridden SetUp but never called super class's SetUp";
   CHECK(teardown_called_)
       << "You have overridden TearDown but never called super class's TearDown";
 }
 
 void AuraTestBase::SetUp() {
   setup_called_ = true;
   testing::Test::SetUp();
-  // ContentTestSuiteBase might have already initialized
-  // MaterialDesignController in unit_tests suite.
-  ui::test::MaterialDesignControllerTestAPI::UninitializeMode();
-  ui::MaterialDesignController::Initialize();
   ui::InitializeInputMethodForTesting();
   ui::GestureConfiguration* gesture_config =
       ui::GestureConfiguration::GetInstance();
   // Changing the parameters for gesture recognition shouldn't cause
   // tests to fail, so we use a separate set of parameters for unit
   // testing.
   gesture_config->set_default_radius(0);
   gesture_config->set_fling_max_cancel_to_down_time_in_ms(400);
   gesture_config->set_fling_max_tap_gap_time_in_ms(200);
   gesture_config->set_gesture_begin_end_types_enabled(true);
@@ skipping 66 matching lines @@
 
 bool AuraTestBase::DispatchEventUsingWindowDispatcher(ui::Event* event) {
   ui::EventDispatchDetails details =
       event_processor()->OnEventFromSource(event);
   CHECK(!details.dispatcher_destroyed);
   return event->handled();
 }
 
 }  // namespace test
 }  // namespace aura