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

chrome/browser/ui/views/button_dropdown_test.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 "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/base/view_event_test_base.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/ui_controls/ui_controls.h"
 #include "ui/views/controls/button/button_dropdown.h"
 
 class ButtonDropDownDragTest : public ViewEventTestBase,
                                ui::SimpleMenuModel::Delegate {
  public:
   ButtonDropDownDragTest()
       : button_(NULL),
-        ALLOW_THIS_IN_INITIALIZER_LIST(menu_model_(this)),
         menu_shown_(false),
         menu_closed_(false) {
   }
 
   virtual ~ButtonDropDownDragTest() {
   }
 
   // ViewEventTestBase implementation.
   virtual void SetUp() OVERRIDE {
-    button_ = new views::ButtonDropDown(NULL, &menu_model_);
+    button_ = new views::ButtonDropDown(NULL, new ui::SimpleMenuModel(this));
 
     ViewEventTestBase::SetUp();
   }
 
   virtual void TearDown() OVERRIDE {
     ViewEventTestBase::TearDown();
   }
 
   virtual views::View* CreateContentsView() OVERRIDE {
     return button_;
@@ skipping 79 matching lines @@
         CreateEventTask(this, &ButtonDropDownDragTest::Step5));
   }
 
   void Step5() {
     ASSERT_TRUE(menu_closed_);
     Done();
   }
 
  private:
   views::ButtonDropDown* button_;
-  ui::SimpleMenuModel menu_model_;
   bool menu_shown_;
   bool menu_closed_;
 };
 
 #if defined(OS_WIN)
 #define MAYBE_DragActivation DISABLED_DragActivation
 #else
 #define MAYBE_DragActivation DragActivation
 #endif
 VIEW_TEST(ButtonDropDownDragTest, MAYBE_DragActivation)