Moves ownership of MenuItemView to MenuRunner as well as responbility

chrome/browser/ui/views/menu_item_view_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 "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_runner.h"
 #include "views/controls/menu/submenu_view.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
 // This is a convenience base class for all tests to provide some
 // common functionality.  It sets up a MenuButton and a MenuItemView
 // and clicks the MenuButton.
 //
 // Subclasses should implement:
 //  BuildMenu()            populate the menu
 //  DoTestOnMessageLoop()  initiate the test
 //
 // Subclasses can call:
 //  Click()       to post a mouse click on a View
 //
 // Although it should be possible to post a menu multiple times,
 // MenuItemView prevents repeated activation of a menu by clicks too
 // close in time.
 class MenuItemViewTestBase : public ViewEventTestBase,
                              public views::ViewMenuDelegate,
                              public views::MenuDelegate {
  public:
-  MenuItemViewTestBase() :
-      ViewEventTestBase(),
-      button_(NULL),
-      menu_(NULL) {
+  MenuItemViewTestBase()
+      : ViewEventTestBase(),
+        button_(NULL),
+        menu_(NULL) {
   }
 
   virtual ~MenuItemViewTestBase() {
   }
 
   // ViewEventTestBase implementation.
 
   virtual void SetUp() OVERRIDE {
     button_ = new views::MenuButton(NULL, L"Menu Test", this, true);
-    menu_.reset(new views::MenuItemView(this));
-    BuildMenu(menu_.get());
+    menu_ = new views::MenuItemView(this);
+    BuildMenu(menu_);
+    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));
   }
 
  protected:
   // Generate a mouse click on the specified view and post a new task.
   virtual void Click(views::View* view, Task* next) {
     ui_controls::MoveMouseToCenterAndPress(
         view,
         ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         next);
   }
 
   virtual void BuildMenu(views::MenuItemView* menu) {
   }
 
   views::MenuButton* button_;
-  scoped_ptr<views::MenuItemView> menu_;
+  views::MenuItemView* menu_;
+  scoped_ptr<views::MenuRunner> menu_runner_;
 };
 
 // Simple test for clicking a menu item.  This template class clicks on an
 // item and checks that the returned id matches.  The index of the item
 // is the template argument.
 template<int INDEX>
 class MenuItemViewTestBasic : public MenuItemViewTestBase {
  public:
   MenuItemViewTestBasic() :
       last_command_(0) {
@@ skipping 15 matching lines @@
     menu->AppendMenuItemWithLabel(3, L"item 3");
   }
 
   // ViewEventTestBase implementation
   virtual void DoTestOnMessageLoop() OVERRIDE {
     Click(button_, CreateEventTask(this, &MenuItemViewTestBasic::Step1));
   }
 
   // Click on item INDEX.
   void Step1() {
-    ASSERT_TRUE(menu_.get());
+    ASSERT_TRUE(menu_);
 
     views::SubmenuView* submenu = menu_->GetSubmenu();
     ASSERT_TRUE(submenu);
     ASSERT_TRUE(submenu->IsShowing());
     ASSERT_EQ(3, submenu->GetMenuItemCount());
 
     // click an item and pass control to the next step
     views::MenuItemView* item = submenu->GetMenuItemAt(INDEX);
     ASSERT_TRUE(item);
     Click(item, CreateEventTask(this, &MenuItemViewTestBasic::Step2));
@@ skipping 41 matching lines @@
     menu->AppendMenuItemWithLabel(2, L"item 2");
   }
 
   // ViewEventTestBase implementation
   virtual void DoTestOnMessageLoop() OVERRIDE {
     Click(button_, CreateEventTask(this, &MenuItemViewTestInsert::Step1));
   }
 
   // Insert item at INSERT_INDEX and click item at SELECT_INDEX.
   void Step1() {
-    ASSERT_TRUE(menu_.get());
+    ASSERT_TRUE(menu_);
 
     views::SubmenuView* submenu = menu_->GetSubmenu();
     ASSERT_TRUE(submenu);
     ASSERT_TRUE(submenu->IsShowing());
     ASSERT_EQ(2, submenu->GetMenuItemCount());
 
     inserted_item_ = menu_->AddMenuItemAt(INSERT_INDEX, 1000,
                                           L"inserted item", SkBitmap(),
                                           views::MenuItemView::NORMAL);
     ASSERT_TRUE(inserted_item_);
     menu_->ChildrenChanged();
 
     // click an item and pass control to the next step
     views::MenuItemView* item = submenu->GetMenuItemAt(SELECT_INDEX);
     ASSERT_TRUE(item);
     Click(item, CreateEventTask(this, &MenuItemViewTestInsert::Step2));
   }
 
   // Check clicked item and complete test.
   void Step2() {
-    ASSERT_TRUE(menu_.get());
+    ASSERT_TRUE(menu_);
 
     views::SubmenuView* submenu = menu_->GetSubmenu();
     ASSERT_TRUE(submenu);
     ASSERT_FALSE(submenu->IsShowing());
     ASSERT_EQ(3, submenu->GetMenuItemCount());
 
     if (SELECT_INDEX == INSERT_INDEX)
       ASSERT_EQ(1000, last_command_);
     else if (SELECT_INDEX < INSERT_INDEX)
       ASSERT_EQ(SELECT_INDEX + 1, last_command_);
@@ skipping 89 matching lines @@
 // then inserts an item in the top-level menu at X.
 typedef MenuItemViewTestInsertWithSubmenu<0> MenuItemViewTestInsertWithSubmenu0;
 typedef MenuItemViewTestInsertWithSubmenu<1> MenuItemViewTestInsertWithSubmenu1;
 VIEW_TEST(MenuItemViewTestInsertWithSubmenu0, InsertItemWithSubmenu0)
 VIEW_TEST(MenuItemViewTestInsertWithSubmenu1, InsertItemWithSubmenu1)
 
 // Test class for removing a menu item while the menu is open.
 template<int REMOVE_INDEX, int SELECT_INDEX>
 class MenuItemViewTestRemove : public MenuItemViewTestBase {
  public:
-  MenuItemViewTestRemove() :
-      last_command_(0) {
+  MenuItemViewTestRemove()
+      : last_command_(0) {
   }
 
   virtual ~MenuItemViewTestRemove() {
   }
 
   // views::MenuDelegate implementation
   virtual void ExecuteCommand(int id) OVERRIDE {
     last_command_ = id;
   }
 
   // MenuItemViewTestBase implementation
   virtual void BuildMenu(views::MenuItemView* menu) OVERRIDE {
     menu->AppendMenuItemWithLabel(1, L"item 1");
     menu->AppendMenuItemWithLabel(2, L"item 2");
     menu->AppendMenuItemWithLabel(3, L"item 3");
   }
 
   // ViewEventTestBase implementation
   virtual void DoTestOnMessageLoop() OVERRIDE {
     Click(button_, CreateEventTask(this, &MenuItemViewTestRemove::Step1));
   }
 
   // Remove item at REMOVE_INDEX and click item at SELECT_INDEX.
   void Step1() {
-    ASSERT_TRUE(menu_.get());
+    ASSERT_TRUE(menu_);
 
     views::SubmenuView* submenu = menu_->GetSubmenu();
     ASSERT_TRUE(submenu);
     ASSERT_TRUE(submenu->IsShowing());
     ASSERT_EQ(3, submenu->GetMenuItemCount());
 
     // remove
     menu_->RemoveMenuItemAt(REMOVE_INDEX);
     menu_->ChildrenChanged();
 
     // click
     views::MenuItemView* item = submenu->GetMenuItemAt(SELECT_INDEX);
     ASSERT_TRUE(item);
     Click(item, CreateEventTask(this, &MenuItemViewTestRemove::Step2));
   }
 
   // Check clicked item and complete test.
   void Step2() {
-    ASSERT_TRUE(menu_.get());
+    ASSERT_TRUE(menu_);
 
     views::SubmenuView* submenu = menu_->GetSubmenu();
     ASSERT_TRUE(submenu);
     ASSERT_FALSE(submenu->IsShowing());
     ASSERT_EQ(2, submenu->GetMenuItemCount());
 
     if (SELECT_INDEX < REMOVE_INDEX)
       ASSERT_EQ(SELECT_INDEX + 1, last_command_);
     else
       ASSERT_EQ(SELECT_INDEX + 2, last_command_);
@@ skipping 44 matching lines @@
   }
 
   // ViewEventTestBase implementation
   virtual void DoTestOnMessageLoop() OVERRIDE {
     Click(button_,
           CreateEventTask(this, &MenuItemViewTestRemoveWithSubmenu::Step1));
   }
 
   // Post submenu.
   void Step1() {
-    ASSERT_TRUE(menu_.get());
+    ASSERT_TRUE(menu_);
 
     views::SubmenuView* submenu = menu_->GetSubmenu();
     ASSERT_TRUE(submenu);
     ASSERT_TRUE(submenu->IsShowing());
 
     Click(submenu_,
           CreateEventTask(this, &MenuItemViewTestRemoveWithSubmenu::Step2));
   }
 
   // Remove item at REMOVE_INDEX and select it to exit the menu loop.
   void Step2() {
-    ASSERT_TRUE(menu_.get());
+    ASSERT_TRUE(menu_);
 
     views::SubmenuView* submenu = menu_->GetSubmenu();
     ASSERT_TRUE(submenu);
     ASSERT_TRUE(submenu->IsShowing());
     ASSERT_EQ(2, submenu->GetMenuItemCount());
 
     // remove
     menu_->RemoveMenuItemAt(REMOVE_INDEX);
     menu_->ChildrenChanged();
 
     // click
     Click(button_,
           CreateEventTask(this, &MenuItemViewTestRemoveWithSubmenu::Step3));
   }
 
   void Step3() {
-    ASSERT_TRUE(menu_.get());
+    ASSERT_TRUE(menu_);
 
     views::SubmenuView* submenu = menu_->GetSubmenu();
     ASSERT_TRUE(submenu);
     ASSERT_FALSE(submenu->IsShowing());
     ASSERT_EQ(1, submenu->GetMenuItemCount());
 
     Done();
   }
 
  private:
   int last_command_;
   views::MenuItemView* submenu_;
 };
 
 typedef MenuItemViewTestRemoveWithSubmenu<0> MenuItemViewTestRemoveWithSubmenu0;
 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1;
 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, RemoveItemWithSubmenu0)
 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, RemoveItemWithSubmenu1)