Mac: Eliminate unintended "menu" method overrides.

chrome/browser/cocoa/delayedmenu_button_unittest.mm

 // Copyright (c) 2009 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/clickhold_button_cell.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/cocoa/delayedmenu_button.h"
@@ skipping 34 matching lines @@
 // crashes.
 TEST_F(DelayedMenuButtonTest, MenuAssign) {
   scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@""]);
   ASSERT_TRUE(menu.get());
 
   [menu insertItemWithTitle:@"" action:nil keyEquivalent:@"" atIndex:0];
   [menu insertItemWithTitle:@"foo" action:nil keyEquivalent:@"" atIndex:1];
   [menu insertItemWithTitle:@"bar" action:nil keyEquivalent:@"" atIndex:2];
   [menu insertItemWithTitle:@"baz" action:nil keyEquivalent:@"" atIndex:3];
   
-  [button_ setMenu:menu];
-  EXPECT_TRUE([button_ menu]);
+  [button_ setAttachedMenu:menu];
+  EXPECT_TRUE([button_ attachedMenu]);
 
-  [button_ setMenuEnabled:YES];
-  EXPECT_TRUE([button_ menuEnabled]);
+  [button_ setAttachedMenuEnabled:YES];
+  EXPECT_TRUE([button_ attachedMenuEnabled]);
 
   // TODO(viettrungluu): Display the menu. (Calling DelayedMenuButton's private
-  // |-menuAction:| method displays it fine, but the problem is getting rid of
-  // the menu. We can catch the |NSMenuDidBeginTrackingNotification| from |menu|
-  // fine, but then |-cancelTracking| doesn't dismiss it. I don't know why.)
+  // |-attachedMenuAction:| method displays it fine, but the problem is
+  // getting rid of the menu. We can catch the
+  // |NSMenuDidBeginTrackingNotification| from |menu| fine, but then
+  // |-cancelTracking| doesn't dismiss it. I don't know why.)
 }
 
 // TODO(viettrungluu): Test the two actions of the button (the normal one and
 // displaying the menu, also making sure the latter drags correctly)? It would
 // require "emulating" a mouse....
 
 }  // namespace