Check switch flag in CancelPermissionRequest

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 134 matching lines @@
       ->SetContentSettingDefaultScope(requesting_origin, embedding_origin,
                                       content_settings_type_, std::string(),
                                       CONTENT_SETTING_DEFAULT);
 }
 
 void PermissionContextBase::CancelPermissionRequest(
     content::WebContents* web_contents,
     const PermissionRequestID& id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
+  if (PermissionRequestManager::IsEnabled()) {
+    PermissionRequest* cancelling = pending_requests_.get(id.ToString());
+    if (cancelling != NULL && web_contents != NULL &&

[raymes, 2016/10/27 04:35:52]

nit: nullptr

[lshang, 2016/10/27 06:45:20]

Done.

+        PermissionRequestManager::FromWebContents(web_contents) != NULL) {
+      PermissionRequestManager::FromWebContents(web_contents)
+          ->CancelRequest(cancelling);
+    }
+  } else {
 #if defined(OS_ANDROID)
-  GetQueueController()->CancelInfoBarRequest(id);
+    GetQueueController()->CancelInfoBarRequest(id);
 #else
-  PermissionRequest* cancelling = pending_requests_.get(id.ToString());
-  if (cancelling != NULL && web_contents != NULL &&
-      PermissionRequestManager::FromWebContents(web_contents) != NULL) {
-    PermissionRequestManager::FromWebContents(web_contents)
-        ->CancelRequest(cancelling);
+    NOTREACHED();
+#endif
   }
-#endif
 }
 
 void PermissionContextBase::DecidePermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     bool user_gesture,
     const BrowserPermissionCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ skipping 130 matching lines @@
                                       content_setting);
 }
 
 bool PermissionContextBase::IsPermissionKillSwitchOn() const {
   const std::string param = variations::GetVariationParamValue(
       kPermissionsKillSwitchFieldStudy,
       PermissionUtil::GetPermissionString(permission_type_));
 
   return param == kPermissionsKillSwitchBlockedValue;
 }