Revert "Enable MD by default on Windows for Canary/Dev and local builds."

ui/base/material_design/material_design_controller_unittest.cc

Index: ui/base/material_design/material_design_controller_unittest.cc
diff --git a/ui/base/material_design/material_design_controller_unittest.cc b/ui/base/material_design/material_design_controller_unittest.cc
index dfea5ed1be1122815ca0cf357b35a6827e7ce217..b86820d89c7174d03ff858e852e7435ed45a9d04 100644
--- a/ui/base/material_design/material_design_controller_unittest.cc
+++ b/ui/base/material_design/material_design_controller_unittest.cc
@@ -24,9 +24,7 @@ class MaterialDesignControllerTest : public testing::Test {
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
-
   void SetCommandLineSwitch(const std::string& value_string);
-  bool CurrentModeIsDefaultMode();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MaterialDesignControllerTest);
@@ -56,11 +54,6 @@ void MaterialDesignControllerTest::SetCommandLineSwitch(
 #endif  // defined(ENABLE_TOPCHROME_MD)
 }
 
-bool MaterialDesignControllerTest::CurrentModeIsDefaultMode() {
-  return MaterialDesignController::GetMode() ==
-      test::MaterialDesignControllerTestAPI::DefaultMode();
-}
-
 class MaterialDesignControllerTestMaterial :
     public MaterialDesignControllerTest {
  public:
@@ -139,7 +132,8 @@ TEST_F(
 TEST_F(
     MaterialDesignControllerTestDefault,
     DisabledCommandLineValueMapsToNonMaterialModeWhenCompileTimeFlagEnabled) {
-  EXPECT_TRUE(CurrentModeIsDefaultMode());
+  EXPECT_EQ(MaterialDesignController::DefaultMode(),
+            MaterialDesignController::GetMode());
 }
 
 // Verify the current mode is reported as the default mode when no command line
@@ -148,12 +142,14 @@ TEST_F(MaterialDesignControllerTest,
        NoCommandLineValueMapsToNonMaterialModeWhenCompileTimeFlagEnabled) {
   ASSERT_FALSE(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kTopChromeMD));
-  EXPECT_TRUE(CurrentModeIsDefaultMode());
+  EXPECT_EQ(MaterialDesignController::DefaultMode(),
+            MaterialDesignController::GetMode());
 }
 
 // Verify an invalid command line value uses the default mode.
 TEST_F(MaterialDesignControllerTestInvalid, InvalidCommandLineValue) {
-  EXPECT_TRUE(CurrentModeIsDefaultMode());
+  EXPECT_EQ(MaterialDesignController::DefaultMode(),
+            MaterialDesignController::GetMode());
 }
 
 // Verify that MaterialDesignController::IsModeMaterial() will be true when