Use customization mode by default in permission bubbles

chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm

Index: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm
index 4642c1beb6fd57db3a773b2d1c4518eb21c3ba58..f54f6be804b58098e4cdbf83669cfafdcf4a1eb5 100644
--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm
@@ -129,20 +129,6 @@ class PermissionBubbleControllerTest : public CocoaTest,
     [menu performActionForItemAtIndex:[menu indexOfItem:next_item]];
   }
 
-  NSMenuItem* FindCustomizeMenuItem() {
-    NSButton* button = FindButtonWithTitle(IDS_PERMISSION_DENY);
-    if (!button || ![button isKindOfClass:[SplitBlockButton class]])
-      return nil;
-    NSString* customize = l10n_util::GetNSString(IDS_PERMISSION_CUSTOMIZE);
-    SplitBlockButton* block_button =
-        base::mac::ObjCCast<SplitBlockButton>(button);
-    for (NSMenuItem* item in [[block_button menu] itemArray]) {
-      if ([[item title] isEqualToString:customize])
-        return item;
-    }
-    return nil;
-  }
-
  protected:
   PermissionBubbleController* controller_;  // Weak;  it deletes itself.
   scoped_ptr<PermissionBubbleCocoa> bridge_;
@@ -160,79 +146,108 @@ TEST_F(PermissionBubbleControllerTest, ShowSinglePermission) {
   [controller_ showAtAnchor:NSZeroPoint
               withDelegate:this
                forRequests:requests_
-              acceptStates:accept_states_
-         customizationMode:NO];
+              acceptStates:accept_states_];
 
   EXPECT_TRUE(FindTextFieldWithString(kPermissionA));
   EXPECT_TRUE(FindButtonWithTitle(IDS_PERMISSION_ALLOW));
   EXPECT_TRUE(FindButtonWithTitle(IDS_PERMISSION_DENY));
   EXPECT_FALSE(FindButtonWithTitle(IDS_OK));
-  EXPECT_FALSE(FindCustomizeMenuItem());
 }
 
 TEST_F(PermissionBubbleControllerTest, ShowMultiplePermissions) {
   AddRequest(kPermissionB);
   AddRequest(kPermissionC);
 
+  accept_states_.push_back(true);  // A
+  accept_states_.push_back(true);  // B
+  accept_states_.push_back(true);  // C
+
   [controller_ showAtAnchor:NSZeroPoint
               withDelegate:this
                forRequests:requests_
-              acceptStates:accept_states_
-         customizationMode:NO];
+              acceptStates:accept_states_];
 
   EXPECT_TRUE(FindTextFieldWithString(kPermissionA));
   EXPECT_TRUE(FindTextFieldWithString(kPermissionB));
   EXPECT_TRUE(FindTextFieldWithString(kPermissionC));
 
-  EXPECT_TRUE(FindButtonWithTitle(IDS_PERMISSION_ALLOW));
-  EXPECT_TRUE(FindButtonWithTitle(IDS_PERMISSION_DENY));
-  EXPECT_TRUE(FindCustomizeMenuItem());
-  EXPECT_FALSE(FindButtonWithTitle(IDS_OK));
+  EXPECT_FALSE(FindButtonWithTitle(IDS_PERMISSION_ALLOW));
+  EXPECT_FALSE(FindButtonWithTitle(IDS_PERMISSION_DENY));
+  EXPECT_TRUE(FindButtonWithTitle(IDS_OK));
 }
 
-TEST_F(PermissionBubbleControllerTest, ShowCustomizationModeAllow) {
-  accept_states_.push_back(true);
+TEST_F(PermissionBubbleControllerTest, ShowMultiplePermissionsAllow) {
+  AddRequest(kPermissionB);
+
+  accept_states_.push_back(true);  // A
+  accept_states_.push_back(true);  // B
+
   [controller_ showAtAnchor:NSZeroPoint
                withDelegate:this
                 forRequests:requests_
-               acceptStates:accept_states_
-          customizationMode:YES];
+               acceptStates:accept_states_];
 
-  // Test that there is one menu, with 'Allow' visible.
+  // Test that all menus have 'Allow' visible.
   EXPECT_TRUE(FindMenuButtonWithTitle(IDS_PERMISSION_ALLOW));
   EXPECT_FALSE(FindMenuButtonWithTitle(IDS_PERMISSION_DENY));
 
   EXPECT_TRUE(FindButtonWithTitle(IDS_OK));
   EXPECT_FALSE(FindButtonWithTitle(IDS_PERMISSION_ALLOW));
   EXPECT_FALSE(FindButtonWithTitle(IDS_PERMISSION_DENY));
-  EXPECT_FALSE(FindCustomizeMenuItem());
 }
 
-TEST_F(PermissionBubbleControllerTest, ShowCustomizationModeBlock) {
-  accept_states_.push_back(false);
+TEST_F(PermissionBubbleControllerTest, ShowMultiplePermissionsBlock) {
+  AddRequest(kPermissionB);
+
+  accept_states_.push_back(false);  // A
+  accept_states_.push_back(false);  // B
+
   [controller_ showAtAnchor:NSZeroPoint
               withDelegate:this
                forRequests:requests_
-              acceptStates:accept_states_
-         customizationMode:YES];
+              acceptStates:accept_states_];
 
-  // Test that there is one menu, with 'Block' visible.
+  // Test that all menus have 'Block' visible.
   EXPECT_TRUE(FindMenuButtonWithTitle(IDS_PERMISSION_DENY));
   EXPECT_FALSE(FindMenuButtonWithTitle(IDS_PERMISSION_ALLOW));
 
   EXPECT_TRUE(FindButtonWithTitle(IDS_OK));
   EXPECT_FALSE(FindButtonWithTitle(IDS_PERMISSION_ALLOW));
   EXPECT_FALSE(FindButtonWithTitle(IDS_PERMISSION_DENY));
-  EXPECT_FALSE(FindCustomizeMenuItem());
+}
+
+TEST_F(PermissionBubbleControllerTest, ShowMultiplePermissionsMixed) {
+  AddRequest(kPermissionB);
+  AddRequest(kPermissionC);
+
+  accept_states_.push_back(false);  // A
+  accept_states_.push_back(false);  // B
+  accept_states_.push_back(true);   // C
+
+  [controller_ showAtAnchor:NSZeroPoint
+              withDelegate:this
+               forRequests:requests_
+              acceptStates:accept_states_];
+
+  // Test that both 'allow' and 'deny' are visible.
+  EXPECT_TRUE(FindMenuButtonWithTitle(IDS_PERMISSION_DENY));
+  EXPECT_TRUE(FindMenuButtonWithTitle(IDS_PERMISSION_ALLOW));
+
+  EXPECT_TRUE(FindButtonWithTitle(IDS_OK));
+  EXPECT_FALSE(FindButtonWithTitle(IDS_PERMISSION_ALLOW));
+  EXPECT_FALSE(FindButtonWithTitle(IDS_PERMISSION_DENY));
 }
 
 TEST_F(PermissionBubbleControllerTest, OK) {
-  accept_states_.push_back(true);
+  AddRequest(kPermissionB);
+
+  accept_states_.push_back(true);  // A
+  accept_states_.push_back(true);  // B
+
   [controller_ showAtAnchor:NSZeroPoint
               withDelegate:this
                forRequests:requests_
-              acceptStates:accept_states_
-         customizationMode:YES];
+              acceptStates:accept_states_];
 
   EXPECT_CALL(*this, Closing()).Times(1);
   [FindButtonWithTitle(IDS_OK) performClick:nil];
@@ -242,8 +257,7 @@ TEST_F(PermissionBubbleControllerTest, Allow) {
   [controller_ showAtAnchor:NSZeroPoint
               withDelegate:this
                forRequests:requests_
-              acceptStates:accept_states_
-         customizationMode:NO];
+              acceptStates:accept_states_];
 
   EXPECT_CALL(*this, Accept()).Times(1);
   [FindButtonWithTitle(IDS_PERMISSION_ALLOW) performClick:nil];
@@ -253,8 +267,7 @@ TEST_F(PermissionBubbleControllerTest, Deny) {
   [controller_ showAtAnchor:NSZeroPoint
               withDelegate:this
                forRequests:requests_
-              acceptStates:accept_states_
-         customizationMode:NO];
+              acceptStates:accept_states_];
 
   EXPECT_CALL(*this, Deny()).Times(1);
   [FindButtonWithTitle(IDS_PERMISSION_DENY) performClick:nil];
@@ -263,14 +276,13 @@ TEST_F(PermissionBubbleControllerTest, Deny) {
 TEST_F(PermissionBubbleControllerTest, ChangePermissionSelection) {
   AddRequest(kPermissionB);
 
-  accept_states_.push_back(true);
-  accept_states_.push_back(false);
+  accept_states_.push_back(true);   // A
+  accept_states_.push_back(false);  // B
 
   [controller_ showAtAnchor:NSZeroPoint
               withDelegate:this
                forRequests:requests_
-              acceptStates:accept_states_
-         customizationMode:YES];
+              acceptStates:accept_states_];
 
   EXPECT_CALL(*this, ToggleAccept(0, false)).Times(1);
   EXPECT_CALL(*this, ToggleAccept(1, true)).Times(1);
@@ -279,18 +291,3 @@ TEST_F(PermissionBubbleControllerTest, ChangePermissionSelection) {
   ChangePermissionMenuSelection(menu_a, IDS_PERMISSION_DENY);
   ChangePermissionMenuSelection(menu_b, IDS_PERMISSION_ALLOW);
 }
-
-TEST_F(PermissionBubbleControllerTest, ClickCustomize) {
-  AddRequest(kPermissionB);
-  [controller_ showAtAnchor:NSZeroPoint
-              withDelegate:this
-               forRequests:requests_
-              acceptStates:accept_states_
-         customizationMode:NO];
-
-  EXPECT_CALL(*this, SetCustomizationMode()).Times(1);
-  NSMenuItem* customize_item = FindCustomizeMenuItem();
-  EXPECT_TRUE(customize_item);
-  NSMenu* menu = [customize_item menu];
-  [menu performActionForItemAtIndex:[menu indexOfItem:customize_item]];
-}