Index: chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller_unittest.mm |
diff --git a/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller_unittest.mm |
index b4fb3155e547c5f3eb7edcd3477e896659c66738..8583736c7f0c544c84e5e93d98245b504eae06a8 100644 |
--- a/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller_unittest.mm |
+++ b/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller_unittest.mm |
@@ -93,6 +93,12 @@ class PermissionBubbleControllerTest : public CocoaProfileTest, |
CocoaProfileTest::TearDown(); |
} |
+ const std::vector<PermissionRequest*>& Requests() override { |
+ return requests_; |
+ } |
+ |
+ const std::vector<bool>& AcceptStates() override { return accept_states_; } |
+ |
void AddRequest(const std::string& title) { |
std::unique_ptr<MockPermissionRequest> request = |
base::MakeUnique<MockPermissionRequest>( |
@@ -192,9 +198,7 @@ TEST_F(PermissionBubbleControllerTest, PageIconDecorationActiveState) { |
} |
TEST_F(PermissionBubbleControllerTest, ShowSinglePermission) { |
- [controller_ showWithDelegate:this |
- forRequests:requests_ |
- acceptStates:accept_states_]; |
+ [controller_ showWithDelegate:this]; |
EXPECT_TRUE(FindTextFieldWithString(kPermissionA)); |
EXPECT_TRUE(FindButtonWithTitle(IDS_PERMISSION_ALLOW)); |
@@ -210,9 +214,7 @@ TEST_F(PermissionBubbleControllerTest, ShowMultiplePermissions) { |
accept_states_.push_back(true); // B |
accept_states_.push_back(true); // C |
- [controller_ showWithDelegate:this |
- forRequests:requests_ |
- acceptStates:accept_states_]; |
+ [controller_ showWithDelegate:this]; |
EXPECT_TRUE(FindTextFieldWithString(kPermissionA)); |
EXPECT_TRUE(FindTextFieldWithString(kPermissionB)); |
@@ -229,9 +231,7 @@ TEST_F(PermissionBubbleControllerTest, ShowMultiplePermissionsAllow) { |
accept_states_.push_back(true); // A |
accept_states_.push_back(true); // B |
- [controller_ showWithDelegate:this |
- forRequests:requests_ |
- acceptStates:accept_states_]; |
+ [controller_ showWithDelegate:this]; |
// Test that all menus have 'Allow' visible. |
EXPECT_TRUE(FindMenuButtonWithTitle(IDS_PERMISSION_ALLOW)); |
@@ -248,9 +248,7 @@ TEST_F(PermissionBubbleControllerTest, ShowMultiplePermissionsBlock) { |
accept_states_.push_back(false); // A |
accept_states_.push_back(false); // B |
- [controller_ showWithDelegate:this |
- forRequests:requests_ |
- acceptStates:accept_states_]; |
+ [controller_ showWithDelegate:this]; |
// Test that all menus have 'Block' visible. |
EXPECT_TRUE(FindMenuButtonWithTitle(IDS_PERMISSION_DENY)); |
@@ -269,9 +267,7 @@ TEST_F(PermissionBubbleControllerTest, ShowMultiplePermissionsMixed) { |
accept_states_.push_back(false); // B |
accept_states_.push_back(true); // C |
- [controller_ showWithDelegate:this |
- forRequests:requests_ |
- acceptStates:accept_states_]; |
+ [controller_ showWithDelegate:this]; |
// Test that both 'allow' and 'deny' are visible. |
EXPECT_TRUE(FindMenuButtonWithTitle(IDS_PERMISSION_DENY)); |
@@ -288,27 +284,21 @@ TEST_F(PermissionBubbleControllerTest, OK) { |
accept_states_.push_back(true); // A |
accept_states_.push_back(true); // B |
- [controller_ showWithDelegate:this |
- forRequests:requests_ |
- acceptStates:accept_states_]; |
+ [controller_ showWithDelegate:this]; |
EXPECT_CALL(*this, Accept()).Times(1); |
[FindButtonWithTitle(IDS_OK) performClick:nil]; |
} |
TEST_F(PermissionBubbleControllerTest, Allow) { |
- [controller_ showWithDelegate:this |
- forRequests:requests_ |
- acceptStates:accept_states_]; |
+ [controller_ showWithDelegate:this]; |
EXPECT_CALL(*this, Accept()).Times(1); |
[FindButtonWithTitle(IDS_PERMISSION_ALLOW) performClick:nil]; |
} |
TEST_F(PermissionBubbleControllerTest, Deny) { |
- [controller_ showWithDelegate:this |
- forRequests:requests_ |
- acceptStates:accept_states_]; |
+ [controller_ showWithDelegate:this]; |
EXPECT_CALL(*this, Deny()).Times(1); |
[FindButtonWithTitle(IDS_PERMISSION_DENY) performClick:nil]; |
@@ -320,9 +310,7 @@ TEST_F(PermissionBubbleControllerTest, ChangePermissionSelection) { |
accept_states_.push_back(true); // A |
accept_states_.push_back(false); // B |
- [controller_ showWithDelegate:this |
- forRequests:requests_ |
- acceptStates:accept_states_]; |
+ [controller_ showWithDelegate:this]; |
EXPECT_CALL(*this, ToggleAccept(0, false)).Times(1); |
EXPECT_CALL(*this, ToggleAccept(1, true)).Times(1); |
@@ -333,9 +321,7 @@ TEST_F(PermissionBubbleControllerTest, ChangePermissionSelection) { |
} |
TEST_F(PermissionBubbleControllerTest, EscapeCloses) { |
- [controller_ showWithDelegate:this |
- forRequests:requests_ |
- acceptStates:accept_states_]; |
+ [controller_ showWithDelegate:this]; |
EXPECT_TRUE([[controller_ window] isVisible]); |
[[controller_ window] |
@@ -345,9 +331,7 @@ TEST_F(PermissionBubbleControllerTest, EscapeCloses) { |
} |
TEST_F(PermissionBubbleControllerTest, EnterFullscreen) { |
- [controller_ showWithDelegate:this |
- forRequests:requests_ |
- acceptStates:accept_states_]; |
+ [controller_ showWithDelegate:this]; |
EXPECT_TRUE([[controller_ window] isVisible]); |
@@ -360,9 +344,7 @@ TEST_F(PermissionBubbleControllerTest, EnterFullscreen) { |
} |
TEST_F(PermissionBubbleControllerTest, ExitFullscreen) { |
- [controller_ showWithDelegate:this |
- forRequests:requests_ |
- acceptStates:accept_states_]; |
+ [controller_ showWithDelegate:this]; |
EXPECT_TRUE([[controller_ window] isVisible]); |