Implement RevokePermission() method in PermissionService.

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 1924 matching lines @@
                               requesting_frame.GetOrigin(),
                               user_gesture,
                               result_callback);
       break;
     case content::PERMISSION_NUM:
       NOTREACHED() << "Invalid RequestPermission for " << permission;
       break;
   }
 }
 
+PermissionContextBase*
+ChromeContentBrowserClient::GetPermissionContextFromProfile(Profile* profile,

[mlamouri (slow - plz ping), 2014/12/19 13:08:03]

I don't think you need this to be part of the class. You should move this to the
anonymous namespace.

nit: I would drop "FromProfile" and simply have GetPermissionContext() but feel
free to keep "FromProfile" if you prefer.

[timvolodine, 2015/01/22 19:37:01]

Done.

+    content::PermissionType permission) {
+  switch (permission) {
+    case content::PERMISSION_MIDI_SYSEX:
+      return MidiPermissionContextFactory::GetForProfile(profile);
+    case content::PERMISSION_NOTIFICATIONS:
+#if defined(ENABLE_NOTIFICATIONS)
+      return DesktopNotificationServiceFactory::GetForProfile(profile);
+#else
+      NOTIMPLEMENTED();
+#endif
+    case content::PERMISSION_GEOLOCATION:
+      return GeolocationPermissionContextFactory::GetForProfile(profile);
+    case content::PERMISSION_PROTECTED_MEDIA:
+      NOTIMPLEMENTED();
+      break;
+    case content::PERMISSION_PUSH_MESSAGING:
+      return gcm::PushMessagingPermissionContextFactory::GetForProfile(profile);
+    case content::PERMISSION_NUM:
+      NOTREACHED() << "Invalid RequestPermission for " << permission;
+      break;
+  }
+  return nullptr;
+}
+
 content::PermissionStatus ChromeContentBrowserClient::GetPermissionStatus(
     content::PermissionType permission,
     content::BrowserContext* browser_context,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
   DCHECK(browser_context);
   Profile* profile = Profile::FromBrowserContext(browser_context);
-
-  PermissionContextBase* context = nullptr;
-  switch (permission) {
-    case content::PERMISSION_MIDI_SYSEX:
-      context = MidiPermissionContextFactory::GetForProfile(profile);
-      break;
-    case content::PERMISSION_NOTIFICATIONS:
-#if defined(ENABLE_NOTIFICATIONS)
-      context = DesktopNotificationServiceFactory::GetForProfile(profile);
-#else
-      NOTIMPLEMENTED();
-#endif
-      break;
-    case content::PERMISSION_GEOLOCATION:
-      context = GeolocationPermissionContextFactory::GetForProfile(profile);
-      break;
-    case content::PERMISSION_PROTECTED_MEDIA:
-      NOTIMPLEMENTED();
-      break;
-    case content::PERMISSION_PUSH_MESSAGING:
-      context = gcm::PushMessagingPermissionContextFactory::GetForProfile(
-          profile);
-      break;
-    case content::PERMISSION_NUM:
-      NOTREACHED() << "Invalid RequestPermission for " << permission;
-      break;
-  }
+  PermissionContextBase* context = GetPermissionContextFromProfile(profile,
+                                                                   permission);
 
   ContentSetting result = context
       ? context->GetPermissionStatus(requesting_origin.GetOrigin(),
                                      embedding_origin.GetOrigin())
       : CONTENT_SETTING_DEFAULT;
 
   return ContentSettingToPermissionStatus(result);
 }
 
+content::PermissionStatus ChromeContentBrowserClient::RevokePermission(
+    content::PermissionType permission,
+    content::BrowserContext* browser_context,
+    const GURL& requesting_origin,
+    const GURL& embedding_origin) {
+  DCHECK(browser_context);
+  Profile* profile = Profile::FromBrowserContext(browser_context);
+  PermissionContextBase* context = GetPermissionContextFromProfile(profile,
+                                                                   permission);
+
+  ContentSetting result = context
+      ? context->RevokePermission(requesting_origin.GetOrigin(),
+                                  embedding_origin.GetOrigin())
+      : CONTENT_SETTING_DEFAULT;

[mlamouri (slow - plz ping), 2014/12/19 13:08:03]

Maybe you could do:

if (!context)
  return PERMISSION_STATUS_ASK;

or PERMISSION_STATUS_DENIED but don't call
ContentSettingToPermissionStatus(result) if the result is anyway bogus.

(same for ::GetPermissionStatus())

[timvolodine, 2015/01/22 19:37:01]

Done.

+
+  return ContentSettingToPermissionStatus(result);
+}
+
 void ChromeContentBrowserClient::CancelPermissionRequest(
     content::PermissionType permission,
     content::WebContents* web_contents,
     int bridge_id,
     const GURL& requesting_frame) {
   int render_process_id = web_contents->GetRenderProcessHost()->GetID();
   int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
 
   const PermissionRequestID request_id(render_process_id,
                                        render_view_id,
@@ skipping 620 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome