[Mac][Material Design] Make Material Design the default.

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 90 matching lines @@
 #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());
 }
 
+#elif defined(OS_MACOSX)
+
+// Verify that MaterialDesignController::IsModeMaterial() is true.
+TEST_F(MaterialDesignControllerTestMaterial, IsModeMaterialInitializesMode) {
+  EXPECT_TRUE(MaterialDesignController::IsModeMaterial());

[tdanderson, 2016/05/05 14:56:55]

Since OSX does include ENABLE_TOPCHROME_MD I don't think any changes to this
file are necessary.

[shrike, 2016/05/05 16:10:51]

Thank you. With your other suggested change the MD tests no longer fail, so I
don't need to do this.

+}
+
 #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());
 }
 
@@ skipping 34 matching lines @@
 // 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