wrench_menu: use NativeTheme colors under aura

ui/views/controls/menu/menu_config_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_config.h"
 
 #include "grit/ui_resources.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/views/controls/menu/menu_image_util.h"
 
 namespace views {
 
 namespace {
 #if defined(OS_WIN)
 static const int kMenuCornerRadiusForAura = 0;
 #else
 static const int kMenuCornerRadiusForAura = 2;
 #endif
 }  // namespace
 
 #if !defined(OS_WIN)
 void MenuConfig::Init(const ui::NativeTheme* theme) {
-  InitAura();
+  InitAura(theme);
 }
 #endif
 
-void MenuConfig::InitAura() {
-  ui::NativeTheme* theme = ui::NativeThemeAura::instance();
+void MenuConfig::InitAura(const ui::NativeTheme* theme) {
   text_color = theme->GetSystemColor(
       ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor);
   menu_horizontal_border_size = 0;
   menu_vertical_border_size = 0;
   submenu_horizontal_inset = 1;
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   arrow_to_edge_padding = 20;
   icon_to_label_padding = 4;
   arrow_width =
       rb.GetImageNamed(IDR_MENU_HIERARCHY_ARROW).ToImageSkia()->width();
@@ skipping 14 matching lines @@
   corner_radius = kMenuCornerRadiusForAura;
   if (ui::NativeTheme::IsNewMenuStyleEnabled())
     AdjustForCommonTheme();
 }
 
 #if !defined(OS_WIN)
 // static
 const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) {
   static MenuConfig* views_instance = NULL;
   if (!views_instance)
-    views_instance = new MenuConfig(ui::NativeTheme::instance());
+    views_instance = new MenuConfig(theme ?
+        theme : ui::NativeTheme::instance());
   return *views_instance;
 }
 #endif
 
 }  // namespace views