Moves ownership of MenuItemView to MenuRunner as well as responbility

chrome/browser/ui/views/menu_model_adapter_test.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 "chrome/browser/automation/ui_controls.h"
 #include "chrome/test/base/view_event_test_base.h"
 #include "ui/base/models/menu_model.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/menu_model_adapter.h"
+#include "views/controls/menu/menu_runner.h"
 #include "views/controls/menu/submenu_view.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/test/test_views_delegate.h"
 #include "views/views_delegate.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
 namespace {
 
 const int kTopMenuBaseId = 100;
@@ skipping 218 matching lines @@
   mutable SubMenuModel sub_menu_model_;
 
   DISALLOW_COPY_AND_ASSIGN(TopMenuModel);
 };
 
 }  // namespace
 
 class MenuModelAdapterTest : public ViewEventTestBase,
                              public views::ViewMenuDelegate {
  public:
-  MenuModelAdapterTest() :
-      ViewEventTestBase(),
-      button_(NULL),
-      menu_model_adapter_(&top_menu_model_) {
+  MenuModelAdapterTest()
+      : ViewEventTestBase(),
+        button_(NULL),
+        menu_model_adapter_(&top_menu_model_),
+        menu_(NULL) {
     old_views_delegate_ = views::ViewsDelegate::views_delegate;
     views::ViewsDelegate::views_delegate = &views_delegate_;
   }
 
   virtual ~MenuModelAdapterTest() {
     views::ViewsDelegate::views_delegate = old_views_delegate_;
   }
 
   // ViewEventTestBase implementation.
 
   virtual void SetUp() OVERRIDE {
     button_ = new views::MenuButton(NULL, L"Menu Adapter Test", this, true);
 
-    menu_.reset(new views::MenuItemView(&menu_model_adapter_));
-    menu_model_adapter_.BuildMenu(menu_.get());
+    menu_ = menu_model_adapter_.CreateMenu();
+    menu_runner_.reset(new views::MenuRunner(menu_));
 
     ViewEventTestBase::SetUp();
   }
 
   virtual void TearDown() OVERRIDE {
-    menu_.reset(NULL);
+    menu_runner_.reset(NULL);
+    menu_ = NULL;
     ViewEventTestBase::TearDown();
   }
 
   virtual views::View* CreateContentsView() OVERRIDE {
     return button_;
   }
 
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     return button_->GetPreferredSize();
   }
 
   // views::ViewMenuDelegate implementation.
   virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE {
     gfx::Point screen_location;
     views::View::ConvertPointToScreen(source, &screen_location);
     gfx::Rect bounds(screen_location, source->size());
-    menu_->RunMenuAt(
+    ignore_result(menu_runner_->RunMenuAt(
         source->GetWidget(),
         button_,
         bounds,
         views::MenuItemView::TOPLEFT,
-        true);
+        views::MenuRunner::HAS_MNEMONICS));
   }
 
   // ViewEventTestBase implementation
   virtual void DoTestOnMessageLoop() OVERRIDE {
     Click(button_, CreateEventTask(this, &MenuModelAdapterTest::Step1));
   }
 
   // Open the submenu.
   void Step1() {
     views::SubmenuView* topmenu = menu_->GetSubmenu();
     ASSERT_TRUE(topmenu);
     ASSERT_TRUE(topmenu->IsShowing());
     ASSERT_FALSE(top_menu_model_.IsSubmenuShowing());
 
     // Click the first item to open the submenu.
     views::MenuItemView* item = topmenu->GetMenuItemAt(0);
     ASSERT_TRUE(item);
     Click(item, CreateEventTask(this, &MenuModelAdapterTest::Step2));
   }
 
   // Rebuild the menu which should close the submenu.
   void Step2() {
     views::SubmenuView* topmenu = menu_->GetSubmenu();
     ASSERT_TRUE(topmenu);
     ASSERT_TRUE(topmenu->IsShowing());
     ASSERT_TRUE(top_menu_model_.IsSubmenuShowing());
 
-    menu_model_adapter_.BuildMenu(menu_.get());
+    menu_model_adapter_.BuildMenu(menu_);
 
     MessageLoopForUI::current()->PostTask(
         FROM_HERE,
         CreateEventTask(this, &MenuModelAdapterTest::Step3));
   }
 
   // Verify that the submenu MenuModel received the close callback
   // and close the menu.
   void Step3() {
     views::SubmenuView* topmenu = menu_->GetSubmenu();
@@ skipping 24 matching lines @@
         ui_controls::DOWN | ui_controls::UP,
         next);
   }
 
   views::ViewsDelegate* old_views_delegate_;
   TestViewsDelegate views_delegate_;
 
   views::MenuButton* button_;
   TopMenuModel top_menu_model_;
   views::MenuModelAdapter menu_model_adapter_;
-  scoped_ptr<views::MenuItemView> menu_;
+  views::MenuItemView* menu_;
+  scoped_ptr<views::MenuRunner> menu_runner_;
 };
 
 VIEW_TEST(MenuModelAdapterTest, RebuildMenu)