[reland] Makes MaterialDesignController initialization explicit

chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc

Index: chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc b/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc
index 2ede2359c3ed1784e7127d10144e1686275f9969..a127432e0dbf96d9c52b44fa883c2a173045ca14 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc
@@ -112,11 +112,8 @@ void ToolbarActionsBarUnitTest::SetUp() {
       extensions::extension_action_test_util::CreateToolbarModelForProfile(
           profile());
 
-  // 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(GetParam());
+  material_design_state_.reset(
+      new ui::test::MaterialDesignControllerTestAPI(GetParam()));
   ToolbarActionsBar::disable_animations_for_testing_ = true;
   browser_action_test_util_.reset(new BrowserActionTestUtil(browser(), false));
 
@@ -133,7 +130,7 @@ void ToolbarActionsBarUnitTest::TearDown() {
   overflow_browser_action_test_util_.reset();
   ToolbarActionsBar::disable_animations_for_testing_ = false;
   redesign_switch_.reset();
-  ui::test::MaterialDesignControllerTestAPI::UninitializeMode();
+  material_design_state_.reset();
   BrowserWithTestWindowTest::TearDown();
 }