[reland] Makes MaterialDesignController initialization explicit

chrome/browser/extensions/extension_action_icon_factory_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/extensions/extension_action_icon_factory.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 126 matching lines @@
 
   // testing::Test overrides:
   void SetUp() override {
     file_thread_.Start();
     io_thread_.Start();
     profile_.reset(new TestingProfile);
     base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
     extension_service_ = static_cast<extensions::TestExtensionSystem*>(
         extensions::ExtensionSystem::Get(profile_.get()))->
         CreateExtensionService(&command_line, base::FilePath(), false);
-    // 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()));
   }
 
   void TearDown() override {
-    ui::test::MaterialDesignControllerTestAPI::UninitializeMode();
+    material_design_state_.reset();
     profile_.reset();  // Get all DeleteSoon calls sent to ui_loop_.
     ui_loop_.RunUntilIdle();
   }
 
   // ExtensionActionIconFactory::Observer overrides:
   void OnIconUpdated() override {
     if (quit_in_icon_updated_)
       base::MessageLoop::current()->QuitWhenIdle();
   }
 
   gfx::ImageSkia GetFavicon() {
     return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_EXTENSIONS_FAVICON);
   }
 
   ExtensionAction* GetBrowserAction(const Extension& extension) {
     return ExtensionActionManager::Get(profile())->GetBrowserAction(extension);
   }
 
   TestingProfile* profile() { return profile_.get(); }
 
  private:
   bool quit_in_icon_updated_;
   base::MessageLoop ui_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
   std::unique_ptr<TestingProfile> profile_;
   ExtensionService* extension_service_;
+  std::unique_ptr<ui::test::MaterialDesignControllerTestAPI>
+      material_design_state_;
 
 #if defined OS_CHROMEOS
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
   chromeos::ScopedTestUserManager test_user_manager_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionActionIconFactoryTest);
 };
 
@@ skipping 116 matching lines @@
   icon = icon_factory.GetIcon(1);
 
   EXPECT_TRUE(ImageRepsAreEqual(
       default_icon.ToImageSkia()->GetRepresentation(1.0f),
       icon.ToImageSkia()->GetRepresentation(1.0f)));
 
 }
 
 }  // namespace
 }  // namespace extensions