[reland] Makes MaterialDesignController initialization explicit

chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc

 // Copyright 2014 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 "chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 94 matching lines @@
       static_cast<extensions::TestExtensionSystem*>(
           extensions::ExtensionSystem::Get(profile()));
   extension_system->CreateExtensionService(
       base::CommandLine::ForCurrentProcess(),
       base::FilePath(),
       false);
   toolbar_model_ =
       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));
 
   if (use_redesign_) {
     overflow_browser_action_test_util_ =
         browser_action_test_util_->CreateOverflowBar();
   }
 }
 
 void ToolbarActionsBarUnitTest::TearDown() {
   // Since the profile gets destroyed in BrowserWithTestWindowTest::TearDown(),
   // we need to delete this now.
   browser_action_test_util_.reset();
   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();
 }
 
 void ToolbarActionsBarUnitTest::ActivateTab(int index) {
   ASSERT_NE(nullptr, browser()->tab_strip_model()->GetWebContentsAt(index));
   browser()->tab_strip_model()->ActivateTabAt(index, true);
 }
 
 scoped_refptr<const extensions::Extension>
 ToolbarActionsBarUnitTest::CreateAndAddExtension(
@@ skipping 451 matching lines @@
       extensions::extension_action_test_util::BROWSER_ACTION);
   toolbar_model()->SetVisibleIconCount(0u);
   {
     base::RunLoop run_loop;
     toolbar_actions_bar()->PopOutAction(action, true, run_loop.QuitClosure());
     run_loop.Run();
   }
   EXPECT_EQ(1u, toolbar_actions_bar()->GetIconCount());
   EXPECT_TRUE(toolbar_actions_bar()->NeedsOverflow());
 }