Remove the Allow/Block drop-down from grouped permission requests for cocoa

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

 // Copyright 2014 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 "chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include "base/mac/foundation_util.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
@@ skipping 79 matching lines @@
     [controller_ close];
     chrome::testing::NSRunLoopRunAllPending();
     owned_requests_.clear();
     CocoaProfileTest::TearDown();
   }
 
   const std::vector<PermissionRequest*>& Requests() override {
     return requests_;
   }
 
-  const std::vector<bool>& AcceptStates() override { return accept_states_; }
+  const std::vector<bool>& AcceptStates() override {
+    // TODO(crbug.com/728483): Remove this function.
+    CR_DEFINE_STATIC_LOCAL(std::vector<bool>, accept_states, ());
+    return accept_states;
+  }
 
   void AddRequest(const std::string& title) {
     std::unique_ptr<MockPermissionRequest> request =
         base::MakeUnique<MockPermissionRequest>(
             title, l10n_util::GetStringUTF8(IDS_PERMISSION_ALLOW),
             l10n_util::GetStringUTF8(IDS_PERMISSION_DENY));
     requests_.push_back(request.get());
     owned_requests_.push_back(std::move(request));
   }
 
   NSButton* FindButtonWithTitle(const std::string& title) {
     return FindButtonWithTitle(base::SysUTF8ToNSString(title),
                                [ConstrainedWindowButton class]);
   }
 
   NSButton* FindButtonWithTitle(int title_id) {
     return FindButtonWithTitle(l10n_util::GetNSString(title_id),
                                [ConstrainedWindowButton class]);
   }
 
-  NSButton* FindMenuButtonWithTitle(int title_id) {
-    return FindButtonWithTitle(l10n_util::GetNSString(title_id),
-                               [NSPopUpButton class]);
-  }
-
   // IDS_PERMISSION_ALLOW and IDS_PERMISSION_DENY are used for two distinct
   // UI elements, both of which derive from NSButton.  So check the expected
   // class, not just NSButton, as well as the title.
   NSButton* FindButtonWithTitle(NSString* title, Class button_class) {
     for (NSButton* view in [[controller_ bubble] subviews]) {
       if ([view isKindOfClass:button_class] &&
           [title isEqualToString:[view title]]) {
         return view;
       }
     }
@@ skipping 11 matching lines @@
       textField = base::mac::ObjCCast<NSTextField>(child);
       if (![[textField stringValue] hasSuffix:text]) {
         textField = FindTextFieldWithString(child, text);
         if (textField)
           break;
       }
     }
     return textField;
   }
 
-  void ChangePermissionMenuSelection(NSButton* menu_button, int next_title_id) {
-    NSMenu* menu = [base::mac::ObjCCastStrict<NSPopUpButton>(menu_button) menu];
-    NSString* next_title = l10n_util::GetNSString(next_title_id);
-    EXPECT_EQ([[menu itemWithTitle:[menu_button title]] state], NSOnState);
-    NSMenuItem* next_item = [menu itemWithTitle:next_title];
-    EXPECT_EQ([next_item state], NSOffState);
-    [menu performActionForItemAtIndex:[menu indexOfItem:next_item]];
-  }
-
  protected:
   PermissionBubbleController* controller_;  // Weak;  it deletes itself.
   std::unique_ptr<PermissionBubbleCocoa> bridge_;
   std::vector<PermissionRequest*> requests_;
   std::vector<std::unique_ptr<PermissionRequest>> owned_requests_;
   std::vector<bool> accept_states_;
 };
 
 TEST_F(PermissionBubbleControllerTest, ShowAndClose) {
   EXPECT_FALSE([[controller_ window] isVisible]);
@@ skipping 20 matching lines @@
   [controller_ close];
   EXPECT_FALSE(decoration->active());
 }
 
 TEST_F(PermissionBubbleControllerTest, ShowSinglePermission) {
   [controller_ showWithDelegate:this];
 
   EXPECT_TRUE(FindTextFieldWithString(kPermissionA));
   EXPECT_TRUE(FindButtonWithTitle(IDS_PERMISSION_ALLOW));
   EXPECT_TRUE(FindButtonWithTitle(IDS_PERMISSION_DENY));
-  EXPECT_FALSE(FindButtonWithTitle(IDS_OK));
 }
 
 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_ showWithDelegate:this];
 
   EXPECT_TRUE(FindTextFieldWithString(kPermissionA));
   EXPECT_TRUE(FindTextFieldWithString(kPermissionB));
   EXPECT_TRUE(FindTextFieldWithString(kPermissionC));
 
-  EXPECT_FALSE(FindButtonWithTitle(IDS_PERMISSION_ALLOW));
-  EXPECT_FALSE(FindButtonWithTitle(IDS_PERMISSION_DENY));
-  EXPECT_TRUE(FindButtonWithTitle(IDS_OK));
-}
-
-TEST_F(PermissionBubbleControllerTest, ShowMultiplePermissionsAllow) {
-  AddRequest(kPermissionB);
-
-  accept_states_.push_back(true);  // A
-  accept_states_.push_back(true);  // B
-
-  [controller_ showWithDelegate:this];
-
-  // 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));
-}
-
-TEST_F(PermissionBubbleControllerTest, ShowMultiplePermissionsBlock) {
-  AddRequest(kPermissionB);
-
-  accept_states_.push_back(false);  // A
-  accept_states_.push_back(false);  // B
-
-  [controller_ showWithDelegate:this];
-
-  // 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));
-}
-
-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_ showWithDelegate:this];
-
-  // 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) {
-  AddRequest(kPermissionB);
-
-  accept_states_.push_back(true);  // A
-  accept_states_.push_back(true);  // B
-
-  [controller_ showWithDelegate:this];
-
-  EXPECT_CALL(*this, Accept()).Times(1);
-  [FindButtonWithTitle(IDS_OK) performClick:nil];
+  EXPECT_TRUE(FindButtonWithTitle(IDS_PERMISSION_ALLOW));
+  EXPECT_TRUE(FindButtonWithTitle(IDS_PERMISSION_DENY));
 }
 
 TEST_F(PermissionBubbleControllerTest, Allow) {
   [controller_ showWithDelegate:this];
 
   EXPECT_CALL(*this, Accept()).Times(1);
+  [FindButtonWithTitle(IDS_PERMISSION_ALLOW) performClick:nil];
+}
+
+TEST_F(PermissionBubbleControllerTest, AllowMultiple) {
+  AddRequest(kPermissionB);
+
+  [controller_ showWithDelegate:this];
+
+  EXPECT_CALL(*this, Accept()).Times(1);
   [FindButtonWithTitle(IDS_PERMISSION_ALLOW) performClick:nil];
 }
 
 TEST_F(PermissionBubbleControllerTest, Deny) {
   [controller_ showWithDelegate:this];
 
   EXPECT_CALL(*this, Deny()).Times(1);
   [FindButtonWithTitle(IDS_PERMISSION_DENY) performClick:nil];
 }
 
-TEST_F(PermissionBubbleControllerTest, ChangePermissionSelection) {
+TEST_F(PermissionBubbleControllerTest, DenyMultiple) {
   AddRequest(kPermissionB);
 
-  accept_states_.push_back(true);   // A
-  accept_states_.push_back(false);  // B
-
   [controller_ showWithDelegate:this];
 
-  EXPECT_CALL(*this, ToggleAccept(0, false)).Times(1);
-  EXPECT_CALL(*this, ToggleAccept(1, true)).Times(1);
-  NSButton* menu_a = FindMenuButtonWithTitle(IDS_PERMISSION_ALLOW);
-  NSButton* menu_b = FindMenuButtonWithTitle(IDS_PERMISSION_DENY);
-  ChangePermissionMenuSelection(menu_a, IDS_PERMISSION_DENY);
-  ChangePermissionMenuSelection(menu_b, IDS_PERMISSION_ALLOW);
+  EXPECT_CALL(*this, Deny()).Times(1);
+  [FindButtonWithTitle(IDS_PERMISSION_DENY) performClick:nil];
 }
 
 TEST_F(PermissionBubbleControllerTest, EscapeCloses) {
   [controller_ showWithDelegate:this];
 
   EXPECT_TRUE([[controller_ window] isVisible]);
   [[controller_ window]
       performKeyEquivalent:cocoa_test_event_utils::KeyEventWithKeyCode(
                                kVK_Escape, '\e', NSKeyDown, 0)];
   EXPECT_FALSE([[controller_ window] isVisible]);
@@ skipping 76 matching lines @@
     base::mac::ScopedObjCClassSwizzler locationSwizzle(
         [PermissionBubbleController class], [MockBubbleNoLocationBar class],
         @selector(hasVisibleLocationBarForBrowser:));
     withoutLocationBar = [controller_ getExpectedAnchorPoint];
   }
 
   // The bubble should be in different places depending if the location bar is
   // available or not.
   EXPECT_NSNE(withLocationBar, withoutLocationBar);
 }