Move requests from GroupedPermissionInfoBarDelegate to PermissionPromptAndroid

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/media/webrtc/media_stream_devices_controller.h"
 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android.h"
@@ skipping 21 matching lines @@
 }
 
 void PermissionPromptAndroid::Show(
     const std::vector<PermissionRequest*>& requests,
     const std::vector<bool>& values) {
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents_);
   if (!infobar_service)
     return;
 
-  infobar_ = GroupedPermissionInfoBarDelegate::Create(
-      this, infobar_service, requests[0]->GetOrigin(), requests);
+  requests_ = requests;
+  infobar_ = GroupedPermissionInfoBarDelegate::Create(this, infobar_service,
+                                                      requests[0]->GetOrigin());
 }
 
 bool PermissionPromptAndroid::CanAcceptRequestUpdate() {
   return false;
 }
 
 void PermissionPromptAndroid::Hide() {
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents_);
   if (infobar_ && infobar_service) {
     infobar_service->RemoveInfoBar(infobar_);
   }
   infobar_ = nullptr;
 }
 
 bool PermissionPromptAndroid::IsVisible() {
   return infobar_ != nullptr;
 }
 
 void PermissionPromptAndroid::UpdateAnchorPosition() {
   NOTREACHED() << "UpdateAnchorPosition is not implemented";
 }
 
 gfx::NativeWindow PermissionPromptAndroid::GetNativeWindow() {
   NOTREACHED() << "GetNativeWindow is not implemented";
   return nullptr;
 }
 
 void PermissionPromptAndroid::Closing() {
+  requests_.clear();

[dominickn, 2017/03/16 03:55:07]

Should requests be cleared before or after calling the delegate method? Seems a
bit weird to clear it first.

[Timothy Loh, 2017/03/17 00:47:27]

If we have a queued request, the PermissionRequestManager will Show() it,
assigning a new value to the vector, so we can't clear it after.

   if (delegate_)
     delegate_->Closing();
 }
 
 void PermissionPromptAndroid::ToggleAccept(int index, bool value) {
   if (delegate_)
     delegate_->ToggleAccept(index, value);
 }
 
 void PermissionPromptAndroid::Accept() {
+  requests_.clear();
   if (delegate_)
     delegate_->Accept();
 }
 
 void PermissionPromptAndroid::Deny() {
+  requests_.clear();
   if (delegate_)
     delegate_->Deny();
 }
 
 // static
 std::unique_ptr<PermissionPrompt> PermissionPrompt::Create(
     content::WebContents* web_contents) {
   return base::MakeUnique<PermissionPromptAndroid>(web_contents);
 }