Remove MaterialDesignController::IsModeMaterial

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 14 matching lines @@
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/test_extension_registry_observer.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/extension.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/material_design/material_design_controller.h"
-#include "ui/base/test/material_design_controller_test_api.h"
 #include "ui/base/ui_base_switches.h"
 
 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #endif
 
 using extensions::ExtensionRegistry;
 
 namespace theme_service_internal {
@@ skipping 231 matching lines @@
   EXPECT_EQ(theme_service, otr_theme_service);
 
 #if !defined(OS_MACOSX)
   // Should get a different ThemeProvider for incognito and original profiles.
   const ui::ThemeProvider& provider =
       ThemeService::GetThemeProviderForProfile(profile_.get());
   const ui::ThemeProvider& otr_provider =
       ThemeService::GetThemeProviderForProfile(
           profile_->GetOffTheRecordProfile());
   EXPECT_NE(&provider, &otr_provider);
-  // And (some) colors should be different in MD mode.
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    EXPECT_NE(provider.GetColor(ThemeProperties::COLOR_TOOLBAR),
-              otr_provider.GetColor(ThemeProperties::COLOR_TOOLBAR));
-  }
+  // And (some) colors should be different.
+  EXPECT_NE(provider.GetColor(ThemeProperties::COLOR_TOOLBAR),
+            otr_provider.GetColor(ThemeProperties::COLOR_TOOLBAR));
 #endif
 }
 
 namespace {
 
 // NotificationObserver which emulates an infobar getting destroyed when the
 // theme changes.
 class InfobarDestroyerOnThemeChange : public content::NotificationObserver {
  public:
   explicit InfobarDestroyerOnThemeChange(Profile* profile)
@@ skipping 90 matching lines @@
   theme_service->UseDefaultTheme();
   EXPECT_TRUE(theme_service->UsingDefaultTheme());
   EXPECT_TRUE(get_theme_supplier(theme_service));
   EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(),
             CustomThemeSupplier::SUPERVISED_USER_THEME);
 }
 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #endif // BUILDFLAG(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();
-    material_design_state_.reset(
-        new ui::test::MaterialDesignControllerTestAPI(
-            ui::MaterialDesignController::MATERIAL_NORMAL));
-  }
-
-  void TearDown() override {
-    material_design_state_.reset();
-    ThemeServiceTest::TearDown();
-  }
-
- 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) {
+// expected for a variety of inputs.
+TEST_F(ThemeServiceTest, SeparatorColor) {
   // Ensure Windows 10 machines use the built-in default colors rather than the
   // current system native colors.
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kDisableDwmComposition);
 
   {
     const ui::ThemeProvider& theme_provider =
         ThemeService::GetThemeProviderForProfile(profile_.get());
     const SkColor frame_color =
         theme_provider.GetColor(ThemeProperties::COLOR_FRAME);
@@ skipping 85 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