[reland] Makes MaterialDesignController initialization explicit

chrome/browser/themes/theme_service_unittest.cc

 // Copyright (c) 2012 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/themes/theme_service.h"
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/path_service.h"
@@ skipping 384 matching lines @@
 }
 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #endif // defined(ENABLE_SUPERVISED_USERS)
 
 #if !defined(OS_MACOSX)  // Mac uses different colors than other platforms.
 // Simple class to run tests in material design mode.
 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
 // expected for a variety of inputs.  We run in material design mode so we can
 // use the material normal and incognito color combinations, which differ from
 // each other in ways that are interesting to test.
 TEST_F(ThemeServiceMaterialDesignTest, SeparatorColor) {
   // Ensure Windows 10 machines use the built-in default colors rather than the
   // current system native colors.
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
@@ skipping 92 matching lines @@
     // it should still be lighter than the tab color.
     separator_color = GetSeparatorColor(tab_color, SK_ColorWHITE);
     separator_luminance = color_utils::GetRelativeLuminance(separator_color);
     EXPECT_LT(separator_luminance, 1);
     EXPECT_GT(separator_luminance, tab_luminance);
   }
 }
 #endif  // !defined(OS_MACOSX)
 
 }; // namespace theme_service_internal