Revert of Use a single views::MenuConfig instance for each platform

ui/views/controls/menu/menu_config.h

 // Copyright (c) 2012 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_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/font_list.h"
 #include "ui/views/views_export.h"
 
+namespace ui {
+class NativeTheme;
+}
+
 namespace views {
 
 // Layout type information for menu items. Use the instance() method to obtain
 // the MenuConfig for the current platform.
 struct VIEWS_EXPORT MenuConfig {
-  MenuConfig();
+  explicit MenuConfig(const ui::NativeTheme* theme);
   ~MenuConfig();
 
-  static const MenuConfig& instance();
+  static const MenuConfig& instance(const ui::NativeTheme* theme);
 
   // Font list used by menus.
   gfx::FontList font_list;
 
   // Color for the arrow to scroll bookmarks.
   SkColor arrow_color;
 
   // Menu border sizes.
   int menu_vertical_border_size;
   int menu_horizontal_border_size;
@@ skipping 83 matching lines @@
 
   // Delay, in ms, between when menus are selected or moused over and the menu
   // appears.
   int show_delay;
 
   // Radius of the rounded corners of the menu border. Must be >= 0.
   int corner_radius;
 
  private:
   // Configures a MenuConfig as appropriate for the current platform.
-  void Init();
+  void Init(const ui::NativeTheme* theme);
+
+  // TODO: temporary until we standardize.
+  void InitAura(const ui::NativeTheme* theme);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_