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

ash/common/shelf/shelf_constants.cc

Index: ash/common/shelf/shelf_constants.cc
diff --git a/ash/common/shelf/shelf_constants.cc b/ash/common/shelf/shelf_constants.cc
index c3377bbd455927cf8615028e60a129f9d2fde097..6809e5f02442c3a1188ea9e43db294700c118f8d 100644
--- a/ash/common/shelf/shelf_constants.cc
+++ b/ash/common/shelf/shelf_constants.cc
@@ -4,7 +4,6 @@
 
 #include "ash/common/shelf/shelf_constants.h"
 
-#include "ash/common/material_design/material_design_controller.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkColor.h"
 
@@ -32,9 +31,8 @@ int GetShelfConstant(ShelfConstant shelf_constant) {
   const int kShelfButtonSize[] = {44, 48, 48};
   const int kShelfInsetsForAutoHide[] = {3, 0, 0};
 
-  const int mode = MaterialDesignController::GetMode();
-  DCHECK(mode >= MaterialDesignController::NON_MATERIAL &&
-         mode <= MaterialDesignController::MATERIAL_EXPERIMENTAL);
+  // fixme

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

nit: Please add TODO(estade) with brief description for anyone who stumbles
across this, you can also cite crbug.com/690957

[Evan Stade, 2017/02/13 17:41:01]

sorry, fixme is supposed to be a note to myself to add docs or fix the code.

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

Done.

+  const int mode = 1;
 
   switch (shelf_constant) {
     case SHELF_SIZE: