Fix cancelling permission requests on Android when the PermissionRequestManager is enabled

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 161 matching lines @@
   }
 
   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 (*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);
+    // showing the dialog, or if we are showing it and it can be cancelled.
+    if (!view_ || view_->MaybeCancelRequest()) {
       requests_.erase(requests_iter);
       accept_states_.erase(accepts_iter);
-
-      if (view_) {
-        view_->Hide();
-        // Will redraw the bubble if it is being shown.
+      if (view_)
         DequeueRequestsAndShowBubble();
-      }
-      return;
+    } else {
+      // The prompt is still being shown so replace the request with a dummy.
+      *requests_iter = new CancelledRequest(*requests_iter);
     }
-
-    // Cancel the existing request and replace it with a dummy.
-    PermissionRequest* cancelled_request =
-        new CancelledRequest(*requests_iter);
-    RequestFinishedIncludingDuplicates(*requests_iter);
-    *requests_iter = cancelled_request;
+    RequestFinishedIncludingDuplicates(request);
     return;
   }
 
   // Since |request| wasn't found in queued_requests_, queued_frame_requests_ or
   // requests_ it must have been marked as a duplicate. We can't search
   // duplicate_requests_ by value, so instead use GetExistingRequest to find the
   // key (request it was duped against), and iterate through duplicates of that.
   PermissionRequest* existing_request = GetExistingRequest(request);
   auto range = duplicate_requests_.equal_range(existing_request);
   for (auto it = range.first; it != range.second; ++it) {
@@ skipping 331 matching lines @@
         Accept();
       }
       break;
     case DISMISS:
       Closing();
       break;
     case NONE:
       NOTREACHED();
   }
 }