Retry of 2b0e51237fa07b4fb9f6c20edcefce094f6cf5f5

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"
@@ skipping 30 matching lines @@
   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)
 }
 
 class MaterialDesignControllerTestMaterial :
     public MaterialDesignControllerTest {
  public:
   MaterialDesignControllerTestMaterial() {
     SetCommandLineSwitch("material");
   }
 
  private:
@@ skipping 26 matching lines @@
  public:
   MaterialDesignControllerTestInvalid() {
     const std::string kInvalidValue = "1nvalid-valu3";
     SetCommandLineSwitch(kInvalidValue);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MaterialDesignControllerTestInvalid);
 };
 
-#if !defined(ENABLE_TOPCHROME_MD)
-
-// Verify the Mode maps to Mode::NON_MATERIAL when the compile time flag is not
-// defined.
-TEST_F(MaterialDesignControllerTest,
-       NonMaterialModeWhenCompileTimeFlagDisabled) {
-  EXPECT_EQ(MaterialDesignController::Mode::NON_MATERIAL,
-            MaterialDesignController::GetMode());
-}
-
-#else
-
 // Verify command line value "material" maps to Mode::MATERIAL when the compile
 // time flag is defined.
 TEST_F(MaterialDesignControllerTestMaterial,
        EnabledCommandLineValueMapsToMaterialModeWhenCompileTimeFlagEnabled) {
   EXPECT_EQ(MaterialDesignController::Mode::MATERIAL_NORMAL,
             MaterialDesignController::GetMode());
 }
 
 // Verify command line value "material-hybrid" maps to Mode::MATERIAL_HYBRID
 // when the compile time flag is defined.
@@ skipping 28 matching lines @@
   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