Revert "Enable MD by default on Windows for Canary/Dev and local builds."

ui/base/material_design/material_design_controller.h

 // 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.
 
 #ifndef UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
 #define UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
 
 #include "base/macros.h"
 #include "ui/base/ui_base_export.h"
 
@@ skipping 13 matching lines @@
     NON_MATERIAL = 0,
     // Basic material design.
     MATERIAL_NORMAL = 1,
     // Material design targeted at mouse/touch hybrid devices.
     MATERIAL_HYBRID = 2
   };
 
   // Initializes |mode_|. Must be called before checking |mode_|.
   static void Initialize();
 
-  // Same as Initialize(), but uses |mode| (instead of DefaultMode()) as the
-  // default value if no command-line switch or field trial overrides it.
-  static void InitializeWithDefaultMode(Mode mode);
-
   // Get the current Mode that should be used by the system.
   static Mode GetMode();
 
   // Returns true if the current mode is a material design variant.
   static bool IsModeMaterial();
 
   // Returns true if the current mode is a material design variant and this mode
   // should be extended to cover secondary UI.
   static bool IsSecondaryUiMaterial();
 
+  // Returns the per-platform default material design variant.
+  static Mode DefaultMode();
+
  private:
   friend class test::MaterialDesignControllerTestAPI;
 
   // Tracks whether |mode_| has been initialized. This is necessary so tests can
   // reset the state back to a clean state during tear down.
   static bool is_mode_initialized_;
 
   // The current Mode to be used by the system.
   static Mode mode_;
 
   // True when |mode_| applies beyond the primary UI (toolbar, tabstrip,
   // etc.). For example, this controls use of MD inside bubbles and dialogs.
   static bool include_secondary_ui_;
 
+  // Declarations only. Do not allow construction of an object.
+  MaterialDesignController();
+  ~MaterialDesignController();
+
   // Resets the initialization state to uninitialized. To be used by tests to
   // allow calling Initialize() more than once.
   static void Uninitialize();
 
   // Set |mode_| to |mode| and updates |is_mode_initialized_| to true. Can be
   // used by tests to directly set the mode.
   static void SetMode(Mode mode);
 
-  // Returns the per-platform default material design variant.
-  static Mode DefaultMode();
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(MaterialDesignController);
+  DISALLOW_COPY_AND_ASSIGN(MaterialDesignController);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_