Use browser top chrome material design by default on Chrome OS

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 59 matching lines @@
 // when the compile time flag is defined.
 TEST_F(
     MaterialDesignControllerTest,
     EnabledHybridCommandLineValueMapsToMaterialHybridModeWhenCompileTimeFlagEnabled) {
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kTopChromeMD, "material-hybrid");
   EXPECT_EQ(MaterialDesignController::Mode::MATERIAL_HYBRID,
             MaterialDesignController::GetMode());
 }
 
-// Verify command line value "" maps to Mode::NON_MATERIAL when the compile time
+// Verify command line value "" maps to the default mode when the compile time
 // flag is defined.
 TEST_F(
     MaterialDesignControllerTest,
     DisabledCommandLineValueMapsToNonMaterialModeWhenCompileTimeFlagEnabled) {
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kTopChromeMD, "");
-  EXPECT_EQ(MaterialDesignController::Mode::NON_MATERIAL,
+  EXPECT_EQ(MaterialDesignController::DefaultMode(),
             MaterialDesignController::GetMode());
 }
 
-// Verify no command line value maps to Mode::NON_MATERIAL when the compile time
+// 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_EQ(MaterialDesignController::Mode::NON_MATERIAL,
+  EXPECT_EQ(MaterialDesignController::DefaultMode(),
             MaterialDesignController::GetMode());
 }
 
-// Verify an invalid command line value uses the default NON_MATERIAL mode.
+// Verify an invalid command line value uses the default mode.
 TEST_F(MaterialDesignControllerTest, InvalidCommandLineValue) {
   const std::string kInvalidValue = "1nvalid-valu3";
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kTopChromeMD, kInvalidValue);
-  EXPECT_EQ(MaterialDesignController::Mode::NON_MATERIAL,
+  EXPECT_EQ(MaterialDesignController::DefaultMode(),
             MaterialDesignController::GetMode());
 }
 
 // Verify that MaterialDesignController::IsModeMaterial() will initialize the
 // mode if it hasn't been initialized yet.
 TEST_F(MaterialDesignControllerTest, IsModeMaterialInitializesMode) {
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kTopChromeMD, "material");
   EXPECT_TRUE(MaterialDesignController::IsModeMaterial());
 }
 
 #endif  // !defined(ENABLE_TOPCHROME_MD)
 
 }  // namespace
 }  // namespace ui