[reland] Makes MaterialDesignController initialization explicit

chrome/browser/themes/theme_service_unittest.cc

Index: chrome/browser/themes/theme_service_unittest.cc
diff --git a/chrome/browser/themes/theme_service_unittest.cc b/chrome/browser/themes/theme_service_unittest.cc
index 2f2d15813e247e7ca09ad5e90179019e617ed131..1cdabab697dcdd70b0815804649fcd11298674ef 100644
--- a/chrome/browser/themes/theme_service_unittest.cc
+++ b/chrome/browser/themes/theme_service_unittest.cc
@@ -402,14 +402,19 @@ class ThemeServiceMaterialDesignTest : public ThemeServiceTest {
  public:
   void SetUp() override {
     ThemeServiceTest::SetUp();
-    ui::test::MaterialDesignControllerTestAPI::SetMode(
-        ui::MaterialDesignController::MATERIAL_NORMAL);
+    material_design_state_.reset(
+        new ui::test::MaterialDesignControllerTestAPI(
+            ui::MaterialDesignController::MATERIAL_NORMAL));
   }
 
   void TearDown() override {
+    material_design_state_.reset();
     ThemeServiceTest::TearDown();
-    ui::test::MaterialDesignControllerTestAPI::UninitializeMode();
   }
+
+ private:
+  std::unique_ptr<ui::test::MaterialDesignControllerTestAPI>
+      material_design_state_;
 };
 
 // Check that the function which computes the separator color behaves as