[reland] Makes MaterialDesignController initialization explicit

ui/views/animation/ink_drop_animation_controller_factory_unittest.cc

 // Copyright 2015 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/views/animation/ink_drop_animation_controller_factory.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/test/test_mock_time_task_runner.h"
@@ skipping 28 matching lines @@
 
  private:
   // Extracts and returns the material design mode from the test parameters.
   ui::MaterialDesignController::Mode GetMaterialMode() const;
 
   std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
 
   // 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);
 };
 
 InkDropAnimationControllerFactoryTest::InkDropAnimationControllerFactoryTest()
     : ink_drop_animation_controller_(nullptr) {
   // 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_)
           .release());
 
   zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
 
   switch (GetMaterialMode()) {
     case ui::MaterialDesignController::NON_MATERIAL:
       break;
     case ui::MaterialDesignController::MATERIAL_NORMAL:
     case ui::MaterialDesignController::MATERIAL_HYBRID:
       // The Timer's used by the InkDropAnimationControllerImpl class require a
       // base::ThreadTaskRunnerHandle instance.
       scoped_refptr<base::TestMockTimeTaskRunner> task_runner(
           new base::TestMockTimeTaskRunner);
       thread_task_runner_handle_.reset(
           new base::ThreadTaskRunnerHandle(task_runner));
       break;
   }
 }
 
 InkDropAnimationControllerFactoryTest::
     ~InkDropAnimationControllerFactoryTest() {
-  ui::test::MaterialDesignControllerTestAPI::UninitializeMode();
+  material_design_state_.reset();
 }
 
 ui::MaterialDesignController::Mode
 InkDropAnimationControllerFactoryTest::GetMaterialMode() const {
   return testing::get<0>(GetParam());
 }
 
 // Note: First argument is optional and intentionally left blank.
 // (it's a prefix for the generated test cases)
 INSTANTIATE_TEST_CASE_P(
@@ skipping 61 matching lines @@
   ink_drop_animation_controller_->AnimateToState(InkDropState::ACTION_PENDING);
   ink_drop_animation_controller_->AnimateToState(
       InkDropState::ALTERNATE_ACTION_PENDING);
   ink_drop_animation_controller_->AnimateToState(InkDropState::ACTIVATED);
   ink_drop_animation_controller_->AnimateToState(InkDropState::DEACTIVATED);
   EXPECT_EQ(InkDropState::HIDDEN,
             ink_drop_animation_controller_->GetTargetInkDropState());
 }
 
 }  // namespace views