Remove |accept_states_| from PermissionRequestManager

chrome/browser/permissions/permission_request_manager_unittest.cc

 // 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.
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 99 matching lines @@
 };
 
 TEST_F(PermissionRequestManagerTest, SingleRequest) {
   manager_->AddRequest(&request1_);
   manager_->DisplayPendingRequests();
   WaitForBubbleToBeShown();
 
   EXPECT_TRUE(prompt_factory_->is_visible());
   ASSERT_EQ(prompt_factory_->request_count(), 1);
 
-  ToggleAccept(0, true);
   Accept();
   EXPECT_TRUE(request1_.granted());
 }
 
 TEST_F(PermissionRequestManagerTest, SingleRequestViewFirst) {
   manager_->DisplayPendingRequests();
   manager_->AddRequest(&request1_);
   WaitForBubbleToBeShown();
 
   EXPECT_TRUE(prompt_factory_->is_visible());
   ASSERT_EQ(prompt_factory_->request_count(), 1);
 
-  ToggleAccept(0, true);
   Accept();
   EXPECT_TRUE(request1_.granted());
 }
 
 // Most requests should never be grouped.
 TEST_F(PermissionRequestManagerTest, TwoRequestsUngrouped) {
   manager_->AddRequest(&request1_);
   manager_->AddRequest(&request2_);
   manager_->DisplayPendingRequests();
 
@@ skipping 13 matching lines @@
 // Only mic/camera requests from the same origin should be grouped.
 TEST_F(PermissionRequestManagerTest, MicCameraGrouped) {
   manager_->AddRequest(&request_mic_);
   manager_->AddRequest(&request_camera_);
   manager_->DisplayPendingRequests();
   WaitForBubbleToBeShown();
 
   EXPECT_TRUE(prompt_factory_->is_visible());
   ASSERT_EQ(prompt_factory_->request_count(), 2);
 
-  ToggleAccept(0, true);
-  ToggleAccept(1, true);
   Accept();
   EXPECT_TRUE(request_mic_.granted());
   EXPECT_TRUE(request_camera_.granted());
 
   // If the requests come from different origins, they should not be grouped.
   manager_->AddRequest(&iframe_request_mic_other_domain_);
   manager_->AddRequest(&request_camera_);
   WaitForBubbleToBeShown();
 
   EXPECT_TRUE(prompt_factory_->is_visible());
   ASSERT_EQ(prompt_factory_->request_count(), 1);
 }
 
 TEST_F(PermissionRequestManagerTest, TwoRequestsTabSwitch) {
   manager_->AddRequest(&request_mic_);
   manager_->AddRequest(&request_camera_);
   manager_->DisplayPendingRequests();
   WaitForBubbleToBeShown();
 
   EXPECT_TRUE(prompt_factory_->is_visible());
   ASSERT_EQ(prompt_factory_->request_count(), 2);
 
-  ToggleAccept(0, true);
-  ToggleAccept(1, false);
-
   MockTabSwitchAway();
   EXPECT_FALSE(prompt_factory_->is_visible());
 
   MockTabSwitchBack();
   WaitForBubbleToBeShown();
   EXPECT_TRUE(prompt_factory_->is_visible());
   ASSERT_EQ(prompt_factory_->request_count(), 2);
 
   Accept();
   EXPECT_TRUE(request_mic_.granted());
-  EXPECT_FALSE(request_camera_.granted());
+  EXPECT_TRUE(request_camera_.granted());
 }
 
 TEST_F(PermissionRequestManagerTest, NoRequests) {
   manager_->DisplayPendingRequests();
   WaitForBubbleToBeShown();
   EXPECT_FALSE(prompt_factory_->is_visible());
 }
 
 TEST_F(PermissionRequestManagerTest, NoView) {
   manager_->AddRequest(&request1_);
@@ skipping 291 matching lines @@
       1);
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptShownGesture,
       static_cast<base::HistogramBase::Sample>(PermissionRequestType::QUOTA),
       1);
   histograms.ExpectTotalCount(
       PermissionUmaUtil::kPermissionsPromptShownNoGesture, 0);
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptRequestsPerPrompt, 1, 1);
 
-  ToggleAccept(0, true);
   Accept();
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptAccepted,
       static_cast<base::HistogramBase::Sample>(PermissionRequestType::QUOTA),
       1);
   histograms.ExpectTotalCount(
       PermissionUmaUtil::kPermissionsPromptDenied, 0);
 
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptAcceptedGesture,
@@ skipping 40 matching lines @@
 // completeness.
 TEST_F(PermissionRequestManagerTest, UMAForSimpleDeniedBubbleAlternatePath) {
   base::HistogramTester histograms;
 
   manager_->AddRequest(&request1_);
   manager_->DisplayPendingRequests();
   WaitForBubbleToBeShown();
   // No need to test UMA for showing prompts again, they were tested in
   // UMAForSimpleAcceptedBubble.
 
-  ToggleAccept(0, false);
-  Accept();
+  Deny();
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptDenied,
       static_cast<base::HistogramBase::Sample>(PermissionRequestType::QUOTA),
       1);
 }
 
 TEST_F(PermissionRequestManagerTest, UMAForMergedAcceptedBubble) {
   base::HistogramTester histograms;
 
   manager_->AddRequest(&request_mic_);
@@ skipping 15 matching lines @@
       static_cast<base::HistogramBase::Sample>(
           PermissionRequestType::PERMISSION_MEDIASTREAM_CAMERA),
       1);
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptRequestsPerPrompt, 2, 1);
   histograms.ExpectTotalCount(
       PermissionUmaUtil::kPermissionsPromptShownGesture, 0);
   histograms.ExpectTotalCount(
       PermissionUmaUtil::kPermissionsPromptShownNoGesture, 0);
 
-  ToggleAccept(0, true);
-  ToggleAccept(1, true);
   Accept();
 
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptAccepted,
       static_cast<base::HistogramBase::Sample>(PermissionRequestType::MULTIPLE),
       1);
   histograms.ExpectBucketCount(
       PermissionUmaUtil::kPermissionsPromptMergedBubbleAccepted,
       static_cast<base::HistogramBase::Sample>(
           PermissionRequestType::PERMISSION_MEDIASTREAM_MIC),
       1);
   histograms.ExpectBucketCount(
       PermissionUmaUtil::kPermissionsPromptMergedBubbleAccepted,
       static_cast<base::HistogramBase::Sample>(
           PermissionRequestType::PERMISSION_MEDIASTREAM_CAMERA),
       1);
 }
 
-TEST_F(PermissionRequestManagerTest, UMAForMergedMixedBubble) {
-  base::HistogramTester histograms;
-
-  manager_->AddRequest(&request_mic_);
-  manager_->AddRequest(&request_camera_);
-  manager_->DisplayPendingRequests();
-  WaitForBubbleToBeShown();
-  // No need to test UMA for showing prompts again, they were tested in
-  // UMAForMergedAcceptedBubble.
-
-  ToggleAccept(0, true);
-  ToggleAccept(1, false);
-  Accept();
-
-  histograms.ExpectUniqueSample(
-      PermissionUmaUtil::kPermissionsPromptDenied,
-      static_cast<base::HistogramBase::Sample>(PermissionRequestType::MULTIPLE),
-      1);
-  histograms.ExpectBucketCount(
-      PermissionUmaUtil::kPermissionsPromptMergedBubbleAccepted,
-      static_cast<base::HistogramBase::Sample>(
-          PermissionRequestType::PERMISSION_MEDIASTREAM_MIC),
-      1);
-  histograms.ExpectBucketCount(
-      PermissionUmaUtil::kPermissionsPromptMergedBubbleDenied,
-      static_cast<base::HistogramBase::Sample>(
-          PermissionRequestType::PERMISSION_MEDIASTREAM_CAMERA),
-      1);
-}
-
 TEST_F(PermissionRequestManagerTest, UMAForMergedDeniedBubble) {
   base::HistogramTester histograms;
 
   manager_->AddRequest(&request_mic_);
   manager_->AddRequest(&request_camera_);
   manager_->DisplayPendingRequests();
   WaitForBubbleToBeShown();
   // No need to test UMA for showing prompts again, they were tested in
   // UMAForMergedAcceptedBubble.
 
-  ToggleAccept(0, false);
-  ToggleAccept(1, false);
-  Accept();
+  Deny();
 
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptDenied,
       static_cast<base::HistogramBase::Sample>(PermissionRequestType::MULTIPLE),
       1);
   histograms.ExpectBucketCount(
       PermissionUmaUtil::kPermissionsPromptMergedBubbleDenied,
       static_cast<base::HistogramBase::Sample>(
           PermissionRequestType::PERMISSION_MEDIASTREAM_MIC),
       1);
   histograms.ExpectBucketCount(
       PermissionUmaUtil::kPermissionsPromptMergedBubbleDenied,
       static_cast<base::HistogramBase::Sample>(
           PermissionRequestType::PERMISSION_MEDIASTREAM_CAMERA),
       1);
 }