[reland] Makes MaterialDesignController initialization explicit

ui/base/test/material_design_controller_test_api.cc

Index: ui/base/test/material_design_controller_test_api.cc
diff --git a/ui/base/test/material_design_controller_test_api.cc b/ui/base/test/material_design_controller_test_api.cc
index 98cf25b9ad8ad9d660aa2a2619f753f26d6e4e19..029af51adc321a48727605588c4a8a7d1696e39e 100644
--- a/ui/base/test/material_design_controller_test_api.cc
+++ b/ui/base/test/material_design_controller_test_api.cc
@@ -7,13 +7,20 @@
 namespace ui {
 namespace test {
 
-void MaterialDesignControllerTestAPI::SetMode(
-    MaterialDesignController::Mode mode) {
+MaterialDesignControllerTestAPI::MaterialDesignControllerTestAPI(
+    MaterialDesignController::Mode mode)
+    : previous_mode_(MaterialDesignController::mode_),
+      previous_initialized_(MaterialDesignController::is_mode_initialized_) {
   MaterialDesignController::SetMode(mode);
 }
 
-void MaterialDesignControllerTestAPI::UninitializeMode() {
-  MaterialDesignController::UninitializeMode();
+MaterialDesignControllerTestAPI::~MaterialDesignControllerTestAPI() {
+  MaterialDesignController::is_mode_initialized_ = previous_initialized_;
+  MaterialDesignController::mode_ = previous_mode_;
+}
+
+void MaterialDesignControllerTestAPI::Uninitialize() {
+  MaterialDesignController::Uninitialize();
 }
 
 }  // namespace test