Make dismiss works for PermissionPromptAndroid

chrome/browser/permissions/permission_context_base.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_context_base.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 206 matching lines @@
 }
 
 void PermissionContextBase::PermissionDecided(
     const PermissionRequestID& id,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     bool user_gesture,
     const BrowserPermissionCallback& callback,
     bool persist,
     ContentSetting content_setting) {
-#if !defined(OS_ANDROID)
-  // Infobar persistence and its related UMA is tracked on the infobar
-  // controller directly.
-  PermissionRequestGestureType gesture_type =
-      user_gesture ? PermissionRequestGestureType::GESTURE
-                   : PermissionRequestGestureType::NO_GESTURE;
-  DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
-         content_setting == CONTENT_SETTING_BLOCK ||
-         content_setting == CONTENT_SETTING_DEFAULT);
-  if (content_setting == CONTENT_SETTING_ALLOW) {
-    PermissionUmaUtil::PermissionGranted(permission_type_, gesture_type,
-                                         requesting_origin, profile_);
-  } else if (content_setting == CONTENT_SETTING_BLOCK) {
-    PermissionUmaUtil::PermissionDenied(permission_type_, gesture_type,
-                                        requesting_origin, profile_);
-  } else {
-    PermissionUmaUtil::PermissionDismissed(permission_type_, gesture_type,
+  if (PermissionRequestManager::IsEnabled()) {
+    // Infobar persistence and its related UMA is tracked on the infobar
+    // controller directly.
+    PermissionRequestGestureType gesture_type =
+        user_gesture ? PermissionRequestGestureType::GESTURE
+                     : PermissionRequestGestureType::NO_GESTURE;
+    DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
+           content_setting == CONTENT_SETTING_BLOCK ||
+           content_setting == CONTENT_SETTING_DEFAULT);
+    if (content_setting == CONTENT_SETTING_ALLOW) {
+      PermissionUmaUtil::PermissionGranted(permission_type_, gesture_type,
                                            requesting_origin, profile_);
+    } else if (content_setting == CONTENT_SETTING_BLOCK) {
+      PermissionUmaUtil::PermissionDenied(permission_type_, gesture_type,
+                                          requesting_origin, profile_);
+    } else {
+      PermissionUmaUtil::PermissionDismissed(permission_type_, gesture_type,
+                                             requesting_origin, profile_);
+    }
   }
-#endif
 
   // Check if we should convert a dismiss decision into a block decision. This
   // is gated on enabling the kBlockPromptsIfDismissedOften feature.
   if (content_setting == CONTENT_SETTING_DEFAULT &&
       PermissionDecisionAutoBlocker::ShouldChangeDismissalToBlock(
           requesting_origin, permission_type_, profile_)) {
     persist = true;
     content_setting = CONTENT_SETTING_BLOCK;
   }
 
@@ skipping 54 matching lines @@
                                       content_setting);
 }
 
 bool PermissionContextBase::IsPermissionKillSwitchOn() const {
   const std::string param = variations::GetVariationParamValue(
       kPermissionsKillSwitchFieldStudy,
       PermissionUtil::GetPermissionString(permission_type_));
 
   return param == kPermissionsKillSwitchBlockedValue;
 }