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

ash/common/system/tray/tray_constants.cc

Index: ash/common/system/tray/tray_constants.cc
diff --git a/ash/common/system/tray/tray_constants.cc b/ash/common/system/tray/tray_constants.cc
index 67ec8cc0ed16d8bde990dfeea0d59c086d3732f9..62285d82f65f07ff23257c926d1b8985d7cbc252 100644
--- a/ash/common/system/tray/tray_constants.cc
+++ b/ash/common/system/tray/tray_constants.cc
@@ -4,7 +4,6 @@
 
 #include "ash/common/system/tray/tray_constants.h"
 
-#include "ash/common/material_design/material_design_controller.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/color_palette.h"
@@ -129,10 +128,8 @@ int GetTrayConstant(TrayConstant constant) {
   const int kTrayImeMenuIcon[] = {40, kTrayItemSize, kTrayItemSize};
   const int kTrayImageItemPadding[] = {1, 3, 3};
 
-  const int mode = MaterialDesignController::GetMode();
-  DCHECK(mode >= MaterialDesignController::NON_MATERIAL &&
-         mode <= MaterialDesignController::MATERIAL_EXPERIMENTAL);
-
+  // FIXME

[tdanderson, 2017/02/13 17:36:28]

ditto to previous comment in shelf_constants

[Evan Stade, 2017/02/13 19:29:42]

Done.

+  const int mode = 1;
   switch (constant) {
     case TRAY_ITEM_HEIGHT_LEGACY:
       return kTrayItemHeightLegacy[mode];