Check switch flag in CancelPermissionRequest

chrome/browser/permissions/permission_context_base.cc

Index: chrome/browser/permissions/permission_context_base.cc
diff --git a/chrome/browser/permissions/permission_context_base.cc b/chrome/browser/permissions/permission_context_base.cc
index 54cef05c281fba2be6b03258f375a1ad1f704f7b..d4d8b9706d3dd98f03615444b981a28e1bbb6ca3 100644
--- a/chrome/browser/permissions/permission_context_base.cc
+++ b/chrome/browser/permissions/permission_context_base.cc
@@ -152,16 +152,20 @@ void PermissionContextBase::CancelPermissionRequest(
     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
+  }
 }
 
 void PermissionContextBase::DecidePermission(