Fixed crashed when activating the context menu for toolbar buttons using Voiceover

chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm

Index: chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm
diff --git a/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm b/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm
index decb67e2796657766f4b0a8fbfd2c6fdbccc28d3..516933e78626834607b10eda00e2207f3cff3bcd 100644
--- a/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm
+++ b/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm
@@ -92,13 +92,39 @@ TEST_F(ClickHoldButtonCellTest, AccessibilityShowMenu) {
 
   [cell setEnableClickHold:YES];
 
+  // There is no action set.
   actionNames = [cell accessibilityActionNames];
   EXPECT_FALSE([actionNames containsObject:NSAccessibilityShowMenuAction]);
 
+  // clickHoldAction should be independent from accessibilityShowMenuAction
+  // since different operations, e.g. releasing vs. not releasing a mouse
+  // button, may need to be performed for each occasion.
   [cell setClickHoldAction:@selector(open)];
   [cell setClickHoldTarget:cellTarget];
 
   actionNames = [cell accessibilityActionNames];
+  EXPECT_FALSE([actionNames containsObject:NSAccessibilityShowMenuAction]);
+  EXPECT_FALSE([cellTarget didOpen]);
+
+  // Even when accessibilityShowMenuAction is set, no action should be available
+  // if neither enableClickHold nor enableRightClickHold are true.
+  [cell setEnableClickHold:NO];
+  [cell setAccessibilityShowMenuAction:@selector(open)];
+  [cell setAccessibilityShowMenuTarget:cellTarget];
+
+  actionNames = [cell accessibilityActionNames];
+  EXPECT_FALSE([actionNames containsObject:NSAccessibilityShowMenuAction]);
+
+  // Now the action should be available.
+  [cell setEnableClickHold:YES];
+
+  actionNames = [cell accessibilityActionNames];
+  EXPECT_TRUE([actionNames containsObject:NSAccessibilityShowMenuAction]);
+
+  [cell setEnableClickHold:NO];
+[cell setEnableRightClick:YES];

[Avi (use Gerrit), 2015/08/01 03:58:51]

indent 2

+
+  actionNames = [cell accessibilityActionNames];
   EXPECT_TRUE([actionNames containsObject:NSAccessibilityShowMenuAction]);
 
   [cell accessibilityPerformAction:NSAccessibilityShowMenuAction];