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 601 matching lines @@
       return content::PERMISSION_STATUS_ASK;
     case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT:
     case CONTENT_SETTING_DEFAULT:
     case CONTENT_SETTING_NUM_SETTINGS:
       break;
   }
   NOTREACHED();
   return content::PERMISSION_STATUS_DENIED;
 }
 
+PermissionContextBase* GetPermissionContext(Profile* profile,
+    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;
+}
+
 }  // namespace
 
 namespace chrome {
 
 ChromeContentBrowserClient::ChromeContentBrowserClient()
     : prerender_tracker_(NULL),
       weak_factory_(this) {
 #if defined(ENABLE_PLUGINS)
   for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i)
     allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]);
@@ skipping 1306 matching lines @@
   }
 }
 
 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 = GetPermissionContext(profile, permission);
 
-  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;
-  }
+  if (!context)
+    return content::PERMISSION_STATUS_ASK;
 
-  ContentSetting result = context
-      ? context->GetPermissionStatus(requesting_origin.GetOrigin(),
-                                     embedding_origin.GetOrigin())
-      : CONTENT_SETTING_DEFAULT;
+  return ContentSettingToPermissionStatus(
+      context->GetPermissionStatus(requesting_origin.GetOrigin(),
+                                   embedding_origin.GetOrigin()));
+}
 
-  return ContentSettingToPermissionStatus(result);
+void ChromeContentBrowserClient::ResetPermission(
+    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 = GetPermissionContext(profile, permission);
+
+  if (!context)
+    return;
+
+  context->ResetPermission(requesting_origin.GetOrigin(),
+                           embedding_origin.GetOrigin());
 }
 
 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();
 
@@ skipping 630 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome