Fixed memory leak. Untangled confusing code with menu initialization and ownership.

ui/views/controls/button/button_dropdown.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/button/button_dropdown.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
@@ skipping 157 matching lines @@
 #endif
   if (menu_position.x() < left_bound)
     menu_position.set_x(left_bound);
 
   // Make the button look depressed while the menu is open.
   SetState(BS_PUSHED);
 
   menu_showing_ = true;
 
   // Create and run menu.  Display an empty menu if model is NULL.
-  if (model_) {
-    MenuModelAdapter menu_delegate(model_);
+  if (model_.get()) {
+    MenuModelAdapter menu_delegate(model_.get());
     menu_delegate.set_triggerable_event_flags(triggerable_event_flags());
     menu_runner_.reset(new MenuRunner(menu_delegate.CreateMenu()));
     MenuRunner::RunResult result =
         menu_runner_->RunMenuAt(GetWidget(), NULL,
                                 gfx::Rect(menu_position, gfx::Size(0, 0)),
                                 MenuItemView::TOPLEFT,
                                 MenuRunner::HAS_MNEMONICS);
     if (result == MenuRunner::MENU_DELETED)
       return;
   } else {
@@ skipping 21 matching lines @@
     SetState(BS_NORMAL);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ButtonDropDown - Accessibility
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 }  // namespace views