[reland] Makes MaterialDesignController initialization explicit

ui/views/animation/ink_drop_animation_controller_factory_unittest.cc

Index: ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
diff --git a/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc b/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
index 3f4d09cb02e66f83549abd8d92772d19a63a3b55..64df5fee3b10eb98db2d2dbd0c0627229f20e7d9 100644
--- a/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
+++ b/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
@@ -46,6 +46,9 @@ class InkDropAnimationControllerFactoryTest
   // Required by base::Timer's.
   std::unique_ptr<base::ThreadTaskRunnerHandle> thread_task_runner_handle_;
 
+  std::unique_ptr<ui::test::MaterialDesignControllerTestAPI>
+      material_design_state_;
+
   DISALLOW_COPY_AND_ASSIGN(InkDropAnimationControllerFactoryTest);
 };
 
@@ -54,8 +57,8 @@ InkDropAnimationControllerFactoryTest::InkDropAnimationControllerFactoryTest()
   // Any call by a previous test to MaterialDesignController::GetMode() will
   // initialize and cache the mode. This ensures that these tests will run from
   // a non-initialized state.
-  ui::test::MaterialDesignControllerTestAPI::UninitializeMode();
-  ui::test::MaterialDesignControllerTestAPI::SetMode(GetMaterialMode());
+  material_design_state_.reset(
+      new ui::test::MaterialDesignControllerTestAPI(GetMaterialMode()));
   ink_drop_animation_controller_.reset(
       InkDropAnimationControllerFactory::CreateInkDropAnimationController(
           &test_ink_drop_host_)
@@ -81,7 +84,7 @@ InkDropAnimationControllerFactoryTest::InkDropAnimationControllerFactoryTest()
 
 InkDropAnimationControllerFactoryTest::
     ~InkDropAnimationControllerFactoryTest() {
-  ui::test::MaterialDesignControllerTestAPI::UninitializeMode();
+  material_design_state_.reset();
 }
 
 ui::MaterialDesignController::Mode