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

ui/views/controls/menu/menu_separator_views.cc

 // 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.
 
 #include "ui/views/controls/menu/menu_separator.h"
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/menu/menu_config.h"
+#include "ui/views/controls/menu/menu_item_view.h"
 
 namespace {
 
 const int kSeparatorHeight = 1;
 
 }  // namespace
 
 namespace views {
 
 #if !defined(OS_WIN)
 void MenuSeparator::OnPaint(gfx::Canvas* canvas) {
   OnPaintAura(canvas);
 }
 #endif
 
 gfx::Size MenuSeparator::GetPreferredSize() const {
-  const MenuConfig& menu_config = MenuConfig::instance();
+  const MenuConfig& menu_config = parent_menu_item_->GetMenuConfig();
   int height = menu_config.separator_height;
   switch(type_) {
     case ui::SPACING_SEPARATOR:
       height = menu_config.separator_spacing_height;
       break;
     case ui::LOWER_SEPARATOR:
       height = menu_config.separator_lower_height;
       break;
     case ui::UPPER_SEPARATOR:
       height = menu_config.separator_upper_height;
@@ skipping 15 matching lines @@
     case ui::SPACING_SEPARATOR:
       return gfx::Rect();
     case ui::UPPER_SEPARATOR:
       break;
     default:
       pos = height() / 2;
       break;
   }
 
   gfx::Rect paint_rect(0, pos, width(), kSeparatorHeight);
-  if (MenuConfig::instance().use_outer_border)
+  if (parent_menu_item_->GetMenuConfig().use_outer_border)
     paint_rect.Inset(1, 0);
   return paint_rect;
 }
 
 void MenuSeparator::OnPaintAura(gfx::Canvas* canvas) {
   canvas->FillRect(GetPaintBounds(),
                    GetNativeTheme()->GetSystemColor(
                        ui::NativeTheme::kColorId_MenuSeparatorColor));
 }
 
 }  // namespace views