Support persist toggle in PermissionRequestManager path on Android

chrome/browser/permissions/grouped_permission_infobar_delegate_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/grouped_permission_infobar_delegate_android.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/android_theme_resources.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/permissions/permission_prompt_android.h"
@@ skipping 17 matching lines @@
   return infobar_service->AddInfoBar(base::MakeUnique<GroupedPermissionInfoBar>(
       base::WrapUnique(new GroupedPermissionInfoBarDelegate(
           permission_prompt, requesting_origin))));
 }
 
 size_t GroupedPermissionInfoBarDelegate::PermissionCount() const {
   return permission_prompt_->PermissionCount();
 }
 
 bool GroupedPermissionInfoBarDelegate::ShouldShowPersistenceToggle() const {
-  return PermissionUtil::ShouldShowPersistenceToggle();
+  return permission_prompt_->ShouldShowPersistenceToggle();
 }
 
 ContentSettingsType GroupedPermissionInfoBarDelegate::GetContentSettingType(
     size_t position) const {
   return permission_prompt_->GetContentSettingType(position);
 }
 
 int GroupedPermissionInfoBarDelegate::GetIconIdForPermission(
     size_t position) const {
   return permission_prompt_->GetIconIdForPermission(position);
@@ skipping 11 matching lines @@
     permission_prompt_->ToggleAccept(position, new_value);
 }
 
 base::string16 GroupedPermissionInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(
       IDS_PERMISSIONS_BUBBLE_PROMPT,
       url_formatter::FormatUrlForSecurityDisplay(requesting_origin_));
 }
 
 bool GroupedPermissionInfoBarDelegate::Accept() {
-  if (permission_prompt_)
+  if (permission_prompt_) {
+    if (permission_prompt_->ShouldShowPersistenceToggle())
+      permission_prompt_->TogglePersist(persist_);
     permission_prompt_->Accept();
+  }
   return true;
 }
 
 bool GroupedPermissionInfoBarDelegate::Cancel() {
-  if (permission_prompt_)
+  if (permission_prompt_) {
+    if (permission_prompt_->ShouldShowPersistenceToggle())
+      permission_prompt_->TogglePersist(persist_);
     permission_prompt_->Deny();
+  }
   return true;
 }
 
 void GroupedPermissionInfoBarDelegate::InfoBarDismissed() {
   if (permission_prompt_)
     permission_prompt_->Closing();
 }
 
 GroupedPermissionInfoBarDelegate::GroupedPermissionInfoBarDelegate(
     PermissionPromptAndroid* permission_prompt,
@@ skipping 32 matching lines @@
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ? IDS_PERMISSION_ALLOW
                                                          : IDS_PERMISSION_DENY);
 }
 
 bool GroupedPermissionInfoBarDelegate::EqualsDelegate(
     infobars::InfoBarDelegate* delegate) const {
   // The PermissionRequestManager doesn't create duplicate infobars so a pointer
   // equality check is sufficient.
   return this == delegate;
 }