Moves ownership of MenuItemView to MenuRunner as well as responbility

views/controls/menu/menu_model_adapter_unittest.cc

Index: views/controls/menu/menu_model_adapter_unittest.cc
diff --git a/views/controls/menu/menu_model_adapter_unittest.cc b/views/controls/menu/menu_model_adapter_unittest.cc
index 035ec165a89224e7fa32a544a8801a45ab30604d..f797d4007fb3c4ea3bd2563e0283cea2e6adb1d2 100644
--- a/views/controls/menu/menu_model_adapter_unittest.cc
+++ b/views/controls/menu/menu_model_adapter_unittest.cc
@@ -7,6 +7,7 @@
 #include "ui/base/models/menu_model_delegate.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/test/views_test_base.h"
 
@@ -200,9 +201,11 @@ TEST_F(MenuModelAdapterTest, BasicTest) {
   views::MenuModelAdapter delegate(&model);
 
   // Create menu.  Build menu twice to check that rebuilding works properly.
-  scoped_ptr<views::MenuItemView> menu(new views::MenuItemView(&delegate));
-  delegate.BuildMenu(menu.get());
-  delegate.BuildMenu(menu.get());
+  MenuItemView* menu = new views::MenuItemView(&delegate);
+  // MenuRunner takes ownership of menu.
+  scoped_ptr<MenuRunner> menu_runner(new MenuRunner(menu));
+  delegate.BuildMenu(menu);
+  delegate.BuildMenu(menu);
   EXPECT_TRUE(menu->HasSubmenu());
 
   // Check top level menu items.
@@ -297,7 +300,7 @@ TEST_F(MenuModelAdapterTest, BasicTest) {
   // Check that selecting the root item is safe.  The MenuModel does
   // not care about the root so MenuModelAdapter should do nothing
   // (not hit the NOTREACHED check) when the root is selected.
-  static_cast<views::MenuDelegate*>(&delegate)->SelectionChanged(menu.get());
+  static_cast<views::MenuDelegate*>(&delegate)->SelectionChanged(menu);
 }
 
 }  // namespace views