[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..a109ba23fa70399c19837322b3aa750936d5ee86 100644
--- a/ui/base/test/material_design_controller_test_api.cc
+++ b/ui/base/test/material_design_controller_test_api.cc
@@ -4,16 +4,25 @@
 
 #include "ui/base/test/material_design_controller_test_api.h"
 
+#include "base/logging.h"

[sky, 2016/04/13 23:49:58]

Do you really need this include?

[varkha, 2016/04/14 00:03:33]

Obviously not, somehow erasing LOGs wasn't enough.

+
 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