Gut ash::MaterialDesignController, and remove the about:flags entry.

ash/common/material_design/material_design_controller.cc

Index: ash/common/material_design/material_design_controller.cc
diff --git a/ash/common/material_design/material_design_controller.cc b/ash/common/material_design/material_design_controller.cc
index b1db3e2a3239e72676ca568f87ad9cfe411e1979..6cf3b9865488a27eded166ffdee4b4cae2002e2d 100644
--- a/ash/common/material_design/material_design_controller.cc
+++ b/ash/common/material_design/material_design_controller.cc
@@ -2,105 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <string>
-
-#include "ash/common/ash_switches.h"
 #include "ash/common/material_design/material_design_controller.h"
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "base/trace_event/trace_event.h"
-
-namespace ash {
-
-namespace {
-MaterialDesignController::Mode mode_ =
-    MaterialDesignController::Mode::UNINITIALIZED;
-}  // namespace
 
-// static
-void MaterialDesignController::Initialize() {
-  TRACE_EVENT0("startup", "ash::MaterialDesignController::InitializeMode");
-  DCHECK_EQ(mode_, Mode::UNINITIALIZED);
-
-  const std::string switch_value =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          ash::switches::kAshMaterialDesign);
-
-  if (switch_value == ash::switches::kAshMaterialDesignExperimental) {
-    SetMode(Mode::MATERIAL_EXPERIMENTAL);
-  } else if (switch_value == ash::switches::kAshMaterialDesignEnabled) {
-    SetMode(Mode::MATERIAL_NORMAL);
-  } else if (switch_value == ash::switches::kAshMaterialDesignDisabled) {
-    SetMode(Mode::NON_MATERIAL);
-  } else {
-    if (!switch_value.empty()) {
-      LOG(ERROR) << "Invalid value='" << switch_value
-                 << "' for command line switch '"
-                 << ash::switches::kAshMaterialDesign << "'.";
-    }
-    SetMode(DefaultMode());
-  }
-}
+#include <string>
 
-// static
-MaterialDesignController::Mode MaterialDesignController::GetMode() {
-  DCHECK_NE(mode_, Mode::UNINITIALIZED);
-  return mode_;
-}
+namespace ash {
 
 // static
 bool MaterialDesignController::IsShelfMaterial() {
-  return IsMaterial();
+  return true;
 }
 
 // static
 bool MaterialDesignController::IsImmersiveModeMaterial() {
-  return IsMaterial();
+  return true;
 }
 
 // static
 bool MaterialDesignController::IsSystemTrayMenuMaterial() {
-  return IsMaterial();
+  return true;
 }
 
 // static
 bool MaterialDesignController::UseMaterialDesignSystemIcons() {
-  return IsMaterial();
-}
-
-// static
-MaterialDesignController::Mode MaterialDesignController::mode() {
-  return mode_;
-}
-
-// static
-bool MaterialDesignController::IsMaterial() {
-  return IsMaterialExperimental() || IsMaterialNormal();
-}
-
-// static
-bool MaterialDesignController::IsMaterialNormal() {
-  return GetMode() == Mode::MATERIAL_NORMAL;
-}
-
-// static
-bool MaterialDesignController::IsMaterialExperimental() {
-  return GetMode() == Mode::MATERIAL_EXPERIMENTAL;
-}
-
-// static
-MaterialDesignController::Mode MaterialDesignController::DefaultMode() {
-  return Mode::MATERIAL_NORMAL;
-}
-
-// static
-void MaterialDesignController::SetMode(Mode mode) {
-  mode_ = mode;
-}
-
-// static
-void MaterialDesignController::Uninitialize() {
-  mode_ = Mode::UNINITIALIZED;
+  return true;
 }
 
 }  // namespace ash