Merge 102241 - MenuConfig::Create passes HFONT to Font ctor but this HFONT isn't deleted. Platfor...

views/controls/menu/menu_config_win.cc

 // Copyright (c) 2011 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 "views/controls/menu/menu_config.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <Vssym32.h>
 
 #include "base/logging.h"
+#include "base/win/scoped_gdi_object.h"
 #include "base/win/win_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/gfx/native_theme_win.h"
 
 using gfx::NativeTheme;
 using gfx::NativeThemeWin;
 
 namespace views {
 
 // static
 MenuConfig* MenuConfig::Create() {
   MenuConfig* config = new MenuConfig();
 
   config->text_color = NativeThemeWin::instance()->GetThemeColorWithDefault(
       NativeThemeWin::MENU, MENU_POPUPITEM, MPI_NORMAL, TMT_TEXTCOLOR,
       COLOR_MENUTEXT);
 
   NONCLIENTMETRICS metrics;
   base::win::GetNonClientMetrics(&metrics);
   l10n_util::AdjustUIFont(&(metrics.lfMenuFont));
-  HFONT font = CreateFontIndirect(&metrics.lfMenuFont);
-  DLOG_ASSERT(font);
-  config->font = gfx::Font(font);
-
+  {
+    base::win::ScopedHFONT font(CreateFontIndirect(&metrics.lfMenuFont));
+    DLOG_ASSERT(font.Get());
+    config->font = gfx::Font(font);
+  }
   NativeTheme::ExtraParams extra;
   extra.menu_check.is_radio = false;
   extra.menu_check.is_selected = false;
   gfx::Size check_size = NativeTheme::instance()->GetPartSize(
       NativeTheme::kMenuCheck, NativeTheme::kNormal, extra);
   if (!check_size.IsEmpty()) {
     config->check_width = check_size.width();
     config->check_height = check_size.height();
   } else {
     config->check_width = GetSystemMetrics(SM_CXMENUCHECK);
@@ skipping 47 matching lines @@
   config->item_no_icon_top_margin = config->item_top_margin;
 
   BOOL show_cues;
   config->show_mnemonics =
       (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &show_cues, 0) &&
        show_cues == TRUE);
   return config;
 }
 
 }  // namespace views