MacViews: Remove GetMenu() from MenuRunner.

chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.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 <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
 #include "chrome/browser/accessibility/accessibility_extension_api_constants.h"
 #include "chrome/browser/ui/views/accessibility/accessibility_event_router_views.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_item_view.h"
+#include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_WIN)
@@ skipping 408 matching lines @@
 
   views::MenuItemView* BuildMenu() {
     menu_model_.reset(new ui::SimpleMenuModel(this));
     menu_model_->AddItem(IDC_MENU_ITEM_1, ASCIIToUTF16("Item 1"));
     menu_model_->AddItem(IDC_MENU_ITEM_2, ASCIIToUTF16("Item 2"));
     menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
     menu_model_->AddItem(IDC_MENU_INVISIBLE, ASCIIToUTF16("Invisible"));
     menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
     menu_model_->AddItem(IDC_MENU_ITEM_3, ASCIIToUTF16("Item 3"));
 
-    menu_runner_.reset(new views::MenuRunner(menu_model_.get(), 0));
-    return menu_runner_->GetMenu();
+    menu_adapter_.reset(new views::MenuModelAdapter(menu_model_.get()));
+    views::MenuItemView* menu_view = menu_adapter_->CreateMenu();
+    menu_runner_.reset(new views::MenuRunner(menu_view, 0));
+    return menu_view;
   }
 
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
     return false;
   }
 
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE {
     return true;
   }
 
   virtual bool IsCommandIdVisible(int command_id) const OVERRIDE {
     return command_id != IDC_MENU_INVISIBLE;
   }
 
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       ui::Accelerator* accelerator) OVERRIDE {
     return false;
   }
 
   virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE {
   }
 
  private:
   scoped_ptr<ui::SimpleMenuModel> menu_model_;
+  scoped_ptr<views::MenuModelAdapter> menu_adapter_;
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleMenuDelegate);
 };
 
 }  // namespace
 
 TEST_F(AccessibilityEventRouterViewsTest, MenuIndexAndCountForInvisibleMenu) {
   SimpleMenuDelegate menu_delegate;
   views::MenuItemView* menu = menu_delegate.BuildMenu();
@@ skipping 16 matching lines @@
 
     AccessibilityEventRouterViews::RecursiveGetMenuItemIndexAndCount(
         menu_container,
         menu->GetMenuItemByID(kTestCases[i].command_id),
         &index,
         &count);
     EXPECT_EQ(kTestCases[i].expected_index, index) << "Case " << i;
     EXPECT_EQ(kTestCases[i].expected_count, count) << "Case " << i;
   }
 }