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

ui/views/controls/menu/submenu_view.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/submenu_view.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 142 matching lines @@
           max_simple_width, dimensions.standard_width);
       max_minor_text_width_ =
           std::max(max_minor_text_width_, dimensions.minor_text_width);
       max_complex_width = std::max(max_complex_width,
           dimensions.standard_width + dimensions.children_width);
     } else {
       max_complex_width = std::max(max_complex_width,
                                    child->GetPreferredSize().width());
     }
   }
-  if (max_minor_text_width_ > 0)
-    max_minor_text_width_ += MenuConfig::instance().label_to_minor_text_padding;
-
+  if (max_minor_text_width_ > 0) {
+    max_minor_text_width_ +=
+        GetMenuItem()->GetMenuConfig().label_to_minor_text_padding;
+  }
   // Finish calculating our optimum width.
   gfx::Insets insets = GetInsets();
   int width = std::max(max_complex_width,
                        std::max(max_simple_width + max_minor_text_width_ +
                                     insets.width(),
                                 minimum_preferred_width_ - 2 * insets.width()));
 
   // Then, the height for that width.
   int height = 0;
   int menu_item_width = width - insets.width();
@@ skipping 333 matching lines @@
   y = std::max(y, 0);
   gfx::Rect new_vis_bounds(x, y, vis_bounds.width(), vis_bounds.height());
   if (new_vis_bounds != vis_bounds) {
     ScrollRectToVisible(new_vis_bounds);
     return true;
   }
   return false;
 }
 
 }  // namespace views