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

chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc

 // Copyright 2014 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 "chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 56 matching lines @@
   // views::ScrollView::GetPreferredSize() includes the contents' size, but
   // not the scrollbar width. Add it in if necessary.
   if (container_->GetPreferredSize().height() > max_height_)
     s.Enlarge(GetScrollBarWidth(), 0);
   return s;
 }
 
 int ExtensionToolbarMenuView::GetHeightForWidth(int width) const {
   // The width passed in here includes the full width of the menu, so we need
   // to omit the necessary padding.
-  const views::MenuConfig& menu_config = views::MenuConfig::instance();
+  const views::MenuConfig& menu_config =
+      static_cast<const views::MenuItemView*>(parent())->GetMenuConfig();
   int end_padding = menu_config.arrow_to_edge_padding -
       container_->toolbar_actions_bar()->platform_settings().item_spacing;
   width -= start_padding() + end_padding;
 
   return views::ScrollView::GetHeightForWidth(width);
 }
 
 void ExtensionToolbarMenuView::Layout() {
   SetPosition(gfx::Point(start_padding(), 0));
   SizeToPreferredSize();
@@ skipping 45 matching lines @@
 }
 
 int ExtensionToolbarMenuView::start_padding() const {
   // We pad enough on the left so that the first icon starts at the same point
   // as the labels. We subtract kItemSpacing because there needs to be padding
   // so we can see the drop indicator.
   return views::MenuItemView::label_start() -
       container_->toolbar_actions_bar()->platform_settings().item_spacing;
 }