MacViews: Run native Cocoa context menus to support Services.

ash/shell_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 "ash/shell.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 352 matching lines @@
 }
 
 TEST_F(ShellTest, LockScreenClosesActiveMenu) {
   SimpleMenuDelegate menu_delegate;
   scoped_ptr<ui::SimpleMenuModel> menu_model(
       new ui::SimpleMenuModel(&menu_delegate));
   menu_model->AddItem(0, base::ASCIIToUTF16("Menu item"));
   views::Widget* widget = ash::Shell::GetPrimaryRootWindowController()->
       wallpaper_controller()->widget();
   scoped_ptr<views::MenuRunner> menu_runner(
-      new views::MenuRunner(menu_model.get()));
+      new views::MenuRunner(menu_model.get(), views::MenuRunner::CONTEXT_MENU));
 
   // When MenuRunner runs a nested loop the LockScreenAndVerifyMenuClosed
   // command will fire, check the menu state and ensure the nested menu loop
   // is exited so that the test will terminate.
   base::MessageLoopForUI::current()->PostTask(FROM_HERE,
       base::Bind(&ShellTest::LockScreenAndVerifyMenuClosed,
                  base::Unretained(this)));
 
   EXPECT_EQ(views::MenuRunner::NORMAL_EXIT,
             menu_runner->RunMenuAt(widget,
                                    NULL,
                                    gfx::Rect(),
                                    views::MENU_ANCHOR_TOPLEFT,
-                                   ui::MENU_SOURCE_MOUSE,
-                                   views::MenuRunner::CONTEXT_MENU));
+                                   ui::MENU_SOURCE_MOUSE));
 }
 
 TEST_F(ShellTest, ManagedWindowModeBasics) {
   // We start with the usual window containers.
   ExpectAllContainers();
   // Shelf is visible.
   ShelfWidget* shelf_widget = Shelf::ForPrimaryDisplay()->shelf_widget();
   EXPECT_TRUE(shelf_widget->IsVisible());
   // Shelf is at bottom-left of screen.
   EXPECT_EQ(0, shelf_widget->GetWindowBoundsInScreen().x());
@@ skipping 135 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellTest2);
 };
 
 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
   window_.reset(new aura::Window(NULL));
   window_->Init(aura::WINDOW_LAYER_NOT_DRAWN);
 }
 
 }  // namespace ash