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

ui/base/material_design/material_design_controller_unittest.cc

 // Copyright 2015 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 <string>
 
 #include "base/command_line.h"
 #include "base/macros.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"
 
 namespace ui {
 namespace {
 
 // Test fixture for the MaterialDesignController class.
 class MaterialDesignControllerTest : public testing::Test {
  public:
   MaterialDesignControllerTest();
   ~MaterialDesignControllerTest() override;
 
  protected:
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
-
   void SetCommandLineSwitch(const std::string& value_string);
-  bool CurrentModeIsDefaultMode();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MaterialDesignControllerTest);
 };
 
 MaterialDesignControllerTest::MaterialDesignControllerTest() {
 }
 
 MaterialDesignControllerTest::~MaterialDesignControllerTest() {
 }
 
 void MaterialDesignControllerTest::SetUp() {
   testing::Test::SetUp();
   MaterialDesignController::Initialize();
 }
 
 void MaterialDesignControllerTest::TearDown() {
   test::MaterialDesignControllerTestAPI::Uninitialize();
   testing::Test::TearDown();
 }
 
 void MaterialDesignControllerTest::SetCommandLineSwitch(
     const std::string& value_string) {
 #if defined(ENABLE_TOPCHROME_MD)
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kTopChromeMD, value_string);
 #endif  // defined(ENABLE_TOPCHROME_MD)
 }
 
-bool MaterialDesignControllerTest::CurrentModeIsDefaultMode() {
-  return MaterialDesignController::GetMode() ==
-      test::MaterialDesignControllerTestAPI::DefaultMode();
-}
-
 class MaterialDesignControllerTestMaterial :
     public MaterialDesignControllerTest {
  public:
   MaterialDesignControllerTestMaterial() {
     SetCommandLineSwitch("material");
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MaterialDesignControllerTestMaterial);
 };
@@ skipping 58 matching lines @@
     EnabledHybridCommandLineValueMapsToMaterialHybridModeWhenCompileTimeFlagEnabled) {
   EXPECT_EQ(MaterialDesignController::Mode::MATERIAL_HYBRID,
             MaterialDesignController::GetMode());
 }
 
 // Verify command line value "" maps to the default mode when the compile time
 // flag is defined.
 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
 // flag is defined.
 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
 // initialized with command line flag "material".
 TEST_F(MaterialDesignControllerTestMaterial, IsModeMaterialInitializesMode) {
   EXPECT_TRUE(MaterialDesignController::IsModeMaterial());
 }
 
 #endif  // !defined(ENABLE_TOPCHROME_MD)
 
 }  // namespace
 }  // namespace ui