Remove |accept_states_| from PermissionRequestManager

chrome/browser/permissions/permission_request_manager.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 "chrome/browser/permissions/permission_request_manager.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 163 matching lines @@
   for (queued_requests_iter = queued_requests_.begin();
        queued_requests_iter != queued_requests_.end(); queued_requests_iter++) {
     if (*queued_requests_iter == request) {
       RequestFinishedIncludingDuplicates(*queued_requests_iter);
       queued_requests_.erase(queued_requests_iter);
       return;
     }
   }
 
   std::vector<PermissionRequest*>::iterator requests_iter;
-  std::vector<bool>::iterator accepts_iter = accept_states_.begin();
-  for (requests_iter = requests_.begin(), accepts_iter = accept_states_.begin();
-       requests_iter != requests_.end();
-       requests_iter++, accepts_iter++) {
+  for (requests_iter = requests_.begin(); requests_iter != requests_.end();
+       requests_iter++) {
     if (*requests_iter != request)
       continue;
 
     // We can simply erase the current entry in the request table if we aren't
     // showing the dialog, or if we are showing it and it can accept the update.
     bool can_erase = !view_ || view_->CanAcceptRequestUpdate();
     if (can_erase) {
       RequestFinishedIncludingDuplicates(*requests_iter);
       requests_.erase(requests_iter);
-      accept_states_.erase(accepts_iter);
 
       if (view_) {
         view_->Hide();
         // Will redraw the bubble if it is being shown.
         DequeueRequestsAndShowBubble();
       }
       return;
     }
 
     // Cancel the existing request and replace it with a dummy.
@@ skipping 113 matching lines @@
   web_contents()->RemoveUserData(UserDataKey());
   // That was the equivalent of "delete this". This object is now destroyed;
   // returning from this function is the only safe thing to do.
 }
 
 const std::vector<PermissionRequest*>& PermissionRequestManager::Requests() {
   return requests_;
 }
 
 const std::vector<bool>& PermissionRequestManager::AcceptStates() {
-  return accept_states_;
+  // TODO(crbug.com/728483): Remove this function.
+  CR_DEFINE_STATIC_LOCAL(std::vector<bool>, accept_states, ());
+  return accept_states;
 }
 
 void PermissionRequestManager::ToggleAccept(int request_index, bool new_value) {
-  DCHECK(request_index < static_cast<int>(accept_states_.size()));
-  accept_states_[request_index] = new_value;
+  // TODO(crbug.com/728483): Remove this function.
 }
 
 void PermissionRequestManager::TogglePersist(bool new_value) {
   persist_ = new_value;
 }
 
 void PermissionRequestManager::Accept() {
-  PermissionUmaUtil::PermissionPromptAccepted(requests_, accept_states_);
+  PermissionUmaUtil::PermissionPromptAccepted(requests_);
 
   std::vector<PermissionRequest*>::iterator requests_iter;
-  std::vector<bool>::iterator accepts_iter = accept_states_.begin();
-  for (requests_iter = requests_.begin(), accepts_iter = accept_states_.begin();
-       requests_iter != requests_.end();
-       requests_iter++, accepts_iter++) {
-    if (*accepts_iter) {
-      PermissionGrantedIncludingDuplicates(*requests_iter);
-    } else {
-      PermissionDeniedIncludingDuplicates(*requests_iter);
-    }
+  for (requests_iter = requests_.begin(); requests_iter != requests_.end();
+       requests_iter++) {
+    PermissionGrantedIncludingDuplicates(*requests_iter);
   }
   FinalizeBubble();
 }
 
 void PermissionRequestManager::Deny() {
-  DCHECK_EQ(1u, requests_.size());
   PermissionUmaUtil::PermissionPromptDenied(requests_);
 
   std::vector<PermissionRequest*>::iterator requests_iter;
   for (requests_iter = requests_.begin();
        requests_iter != requests_.end();
        requests_iter++) {
     PermissionDeniedIncludingDuplicates(*requests_iter);
   }
   FinalizeBubble();
 }
@@ skipping 32 matching lines @@
 
   requests_.push_back(queued_requests_.front());
   queued_requests_.pop_front();
 
   if (!queued_requests_.empty() &&
       ShouldGroupRequests(requests_.front(), queued_requests_.front())) {
     requests_.push_back(queued_requests_.front());
     queued_requests_.pop_front();
   }
 
-  // Sets the default value for each request to be 'accept'.
-  accept_states_.resize(requests_.size(), true);
-
   ShowBubble();
 }
 
 void PermissionRequestManager::ShowBubble() {
   DCHECK(view_);
   DCHECK(!requests_.empty());
   DCHECK(main_frame_has_fully_loaded_);
 
   view_->Show();
   PermissionUmaUtil::PermissionPromptShown(requests_);
   NotifyBubbleAdded();
 
   // If in testing mode, automatically respond to the bubble that was shown.
   if (auto_response_for_test_ != NONE)
     DoAutoResponseForTesting();
 }
 
 void PermissionRequestManager::FinalizeBubble() {
   if (view_ && !view_->HidesAutomatically())
     view_->Hide();
 
   std::vector<PermissionRequest*>::iterator requests_iter;
   for (requests_iter = requests_.begin();
        requests_iter != requests_.end();
        requests_iter++) {
     RequestFinishedIncludingDuplicates(*requests_iter);
   }
   requests_.clear();
-  accept_states_.clear();
   if (queued_requests_.size())
     DequeueRequestsAndShowBubble();
 }
 
 void PermissionRequestManager::CancelPendingQueues() {
   std::deque<PermissionRequest*>::iterator requests_iter;
   for (requests_iter = queued_requests_.begin();
        requests_iter != queued_requests_.end();
        requests_iter++) {
     RequestFinishedIncludingDuplicates(*requests_iter);
@@ skipping 74 matching lines @@
   for (Observer& observer : observer_list_)
     observer.OnBubbleAdded();
 }
 
 void PermissionRequestManager::DoAutoResponseForTesting() {
   switch (auto_response_for_test_) {
     case ACCEPT_ALL:
       Accept();
       break;
     case DENY_ALL:
-      // Deny() assumes there is only 1 request.
-      if (accept_states_.size() == 1) {
-        Deny();
-      } else {
-        for (size_t i = 0; i < accept_states_.size(); ++i)
-          accept_states_[i] = false;
-        Accept();
-      }
+      Deny();
       break;
     case DISMISS:
       Closing();
       break;
     case NONE:
       NOTREACHED();
   }
 }