Fix cancelling permission requests on Android when the PermissionRequestManager is enabled

chrome/browser/permissions/permission_prompt_android.cc

 // Copyright 2016 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_prompt_android.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android.h"
 #include "chrome/browser/permissions/permission_request.h"
 
 PermissionPromptAndroid::PermissionPromptAndroid(
     content::WebContents* web_contents)
     : web_contents_(web_contents), delegate_(nullptr) {
   DCHECK(web_contents);
 }
 
 PermissionPromptAndroid::~PermissionPromptAndroid() {}
 
 void PermissionPromptAndroid::SetDelegate(Delegate* delegate) {
   delegate_ = delegate;
 }
 
 void PermissionPromptAndroid::Show(
     const std::vector<PermissionRequest*>& requests,
     const std::vector<bool>& values) {
+  if (IsVisible()) {
+    // Show() was called because we just rejected a MaybeCancelRequest() call.
+    // The existing infobar will keep working but the old requests vector is now
+    // invalid.
+    requests_ = requests;
+    return;
+  }
+
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents_);
   if (!infobar_service)
     return;
 
   requests_ = requests;
   GroupedPermissionInfoBarDelegate::Create(this, infobar_service,
                                            requests[0]->GetOrigin());
 }
 
-bool PermissionPromptAndroid::CanAcceptRequestUpdate() {
+bool PermissionPromptAndroid::MaybeCancelRequest() {
+  // We do not support cancelling on Android to keep the code simple.

[raymes, 2017/05/01 04:23:34]

Isn't the reason because we think that infobars should not disappear while the
user is viewing them?

   return false;
 }
 
 bool PermissionPromptAndroid::HidesAutomatically() {
   return true;
 }
 
 void PermissionPromptAndroid::Hide() {
-  // Hide() is only called if HidesAutomatically() returns false or
-  // CanAcceptRequestUpdate() return true.
+  // Hide() is not called because HidesAutomatically() returns true
   NOTREACHED();
 }
 
 bool PermissionPromptAndroid::IsVisible() {
   return !requests_.empty();
 }
 
 void PermissionPromptAndroid::UpdateAnchorPosition() {
   NOTREACHED() << "UpdateAnchorPosition is not implemented";
 }
@@ skipping 41 matching lines @@
     size_t position) const {
   DCHECK_LT(position, requests_.size());
   return requests_[position]->GetMessageTextFragment();
 }
 
 // static
 std::unique_ptr<PermissionPrompt> PermissionPrompt::Create(
     content::WebContents* web_contents) {
   return base::MakeUnique<PermissionPromptAndroid>(web_contents);
 }