Implement RevokePermission() method in PermissionService.

This patch implements RevokePermission() method in the mojo
PermissionService. This method will probably be for internal
use only for now. The semantics of the method is that it
will reset the permission to its default value in chrome if
the permission is currently granted.

BUG=430238

Review URL: https://codereview.chromium.org/819463002

Cr-Commit-Position: refs/heads/master@{#314163}

chrome/browser/chrome_content_browser_client.cc

@@ -620,6 +620,36 @@ ContentSettingToPermissionStatus(ContentSetting setting) {
   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_IDENTIFIER:
+#if defined(OS_ANDROID)
+      return ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(
+          profile);
+#else
+      NOTIMPLEMENTED();
+      break;
+#endif
+    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 {
@@ -1946,45 +1976,30 @@ content::PermissionStatus ChromeContentBrowserClient::GetPermissionStatus(
     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_IDENTIFIER:
-#if defined(OS_ANDROID)
-      context = ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(
-          profile);
-#else
-      NOTIMPLEMENTED();
-#endif
-      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;
+
+  return ContentSettingToPermissionStatus(
+      context->GetPermissionStatus(requesting_origin.GetOrigin(),
+                                   embedding_origin.GetOrigin()));
+}
+
+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);
 
-  ContentSetting result = context
-      ? context->GetPermissionStatus(requesting_origin.GetOrigin(),
-                                     embedding_origin.GetOrigin())
-      : CONTENT_SETTING_DEFAULT;
+  if (!context)
+    return;
 
-  return ContentSettingToPermissionStatus(result);
+  context->ResetPermission(requesting_origin.GetOrigin(),
+                           embedding_origin.GetOrigin());
 }
 
 void ChromeContentBrowserClient::CancelPermissionRequest(

chrome/browser/chrome_content_browser_client.h

@@ -194,6 +194,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
       content::BrowserContext* browser_context,
       const GURL& requesting_origin,
       const GURL& embedding_origin) override;
+  void ResetPermission(
+      content::PermissionType permission,
+      content::BrowserContext* browser_context,
+      const GURL& requesting_origin,
+      const GURL& embedding_origin) override;
   void CancelPermissionRequest(content::PermissionType permission,
                                content::WebContents* web_contents,
                                int bridge_id,

chrome/browser/content_settings/permission_context_base.cc

@@ -55,6 +55,15 @@ ContentSetting PermissionContextBase::GetPermissionStatus(
       requesting_origin, embedding_origin, permission_type_, std::string());
 }
 
+void PermissionContextBase::ResetPermission(
+    const GURL& requesting_origin,
+    const GURL& embedding_origin) {
+  profile_->GetHostContentSettingsMap()->SetContentSetting(
+      ContentSettingsPattern::FromURLNoWildcard(requesting_origin),
+      ContentSettingsPattern::FromURLNoWildcard(embedding_origin),
+      permission_type_, std::string(), CONTENT_SETTING_DEFAULT);
+}
+
 void PermissionContextBase::CancelPermissionRequest(
     content::WebContents* web_contents,
     const PermissionRequestID& id) {

chrome/browser/content_settings/permission_context_base.h

@@ -69,6 +69,10 @@ class PermissionContextBase : public KeyedService {
       const GURL& requesting_origin,
       const GURL& embedding_origin) const;
 
+  // Resets the permission to its default value.
+  virtual void ResetPermission(const GURL& requesting_origin,
+                               const GURL& embedding_origin);
+
   // Withdraw an existing permission request, no op if the permission request
   // was already cancelled by some other means.
   virtual void CancelPermissionRequest(content::WebContents* web_contents,

chrome/browser/content_settings/permission_context_base_unittest.cc

@@ -121,7 +121,7 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
         profile()->GetHostContentSettingsMap()->GetContentSetting(
             url.GetOrigin(), url.GetOrigin(),
             CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string());
-    EXPECT_EQ(CONTENT_SETTING_ALLOW , setting);
+    EXPECT_EQ(CONTENT_SETTING_ALLOW, setting);
   }
 
   void TestAskAndDismiss_TestContent() {
@@ -149,7 +149,7 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
         profile()->GetHostContentSettingsMap()->GetContentSetting(
             url.GetOrigin(), url.GetOrigin(),
             CONTENT_SETTINGS_TYPE_MIDI_SYSEX, std::string());
-    EXPECT_EQ(CONTENT_SETTING_ASK , setting);
+    EXPECT_EQ(CONTENT_SETTING_ASK, setting);
   }
 
   void TestRequestPermissionInvalidUrl(ContentSettingsType type) {
@@ -178,6 +178,45 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
     EXPECT_EQ(CONTENT_SETTING_ASK, setting);
   }
 
+  void TestGrantAndRevoke_TestContent(ContentSettingsType type,
+                                      ContentSetting expected_default) {
+    TestPermissionContext permission_context(profile(), type);
+    GURL url("http://www.google.com");
+    content::WebContentsTester::For(web_contents())->NavigateAndCommit(url);
+
+    const PermissionRequestID id(
+        web_contents()->GetRenderProcessHost()->GetID(),
+        web_contents()->GetRenderViewHost()->GetRoutingID(),
+        -1, GURL());
+    permission_context.RequestPermission(
+        web_contents(),
+        id, url, true,
+        base::Bind(&TestPermissionContext::TrackPermissionDecision,
+                   base::Unretained(&permission_context)));
+
+    RespondToPermission(&permission_context, id, url, true);
+    EXPECT_TRUE(permission_context.permission_set());
+    EXPECT_TRUE(permission_context.permission_granted());
+    EXPECT_TRUE(permission_context.tab_context_updated());
+
+    ContentSetting setting =
+        profile()->GetHostContentSettingsMap()->GetContentSetting(
+            url.GetOrigin(), url.GetOrigin(),
+            type, std::string());
+    EXPECT_EQ(CONTENT_SETTING_ALLOW, setting);
+
+    // Try to reset permission.
+    permission_context.ResetPermission(url.GetOrigin(), url.GetOrigin());
+    ContentSetting setting_after_reset =
+        profile()->GetHostContentSettingsMap()->GetContentSetting(
+            url.GetOrigin(), url.GetOrigin(),
+            type, std::string());
+    ContentSetting default_setting =
+        profile()->GetHostContentSettingsMap()->GetDefaultContentSetting(
+            type, nullptr);
+    EXPECT_EQ(default_setting, setting_after_reset);
+  }
+
  private:
   // ChromeRenderViewHostTestHarness:
   void SetUp() override {
@@ -217,3 +256,40 @@ TEST_F(PermissionContextBaseTests, TestNonValidRequestingUrl) {
       CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER);
 #endif
 }
+
+// Simulates granting and revoking of permissions.
+TEST_F(PermissionContextBaseTests, TestGrantAndRevoke) {
+  TestGrantAndRevoke_TestContent(CONTENT_SETTINGS_TYPE_GEOLOCATION,
+                                 CONTENT_SETTING_ASK);
+  TestGrantAndRevoke_TestContent(CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
+                                 CONTENT_SETTING_ASK);
+#if defined(OS_ANDROID)
+  TestGrantAndRevoke_TestContent(
+      CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, CONTENT_SETTING_ASK);
+#endif
+  // TODO(timvolodine): currently no test for
+  // CONTENT_SETTINGS_TYPE_NOTIFICATIONS because notification permissions work
+  // differently with infobars as compared to bubbles (crbug.com/453784).
+  // TODO(timvolodine): currently no test for
+  // CONTENT_SETTINGS_TYPE_PUSH_MESSAGING because infobars do not implement push
+  // messaging permissions (crbug.com/453788).
+}
+
+// Simulates granting and revoking of permissions using permission bubbles.
+TEST_F(PermissionContextBaseTests, TestGrantAndRevokeWithBubbles) {
+  StartUsingPermissionBubble();
+  TestGrantAndRevoke_TestContent(CONTENT_SETTINGS_TYPE_GEOLOCATION,
+                                 CONTENT_SETTING_ASK);
+#if defined(ENABLE_NOTIFICATIONS)
+  TestGrantAndRevoke_TestContent(CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+                                 CONTENT_SETTING_ASK);
+#endif
+  TestGrantAndRevoke_TestContent(CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
+                                 CONTENT_SETTING_ASK);
+  TestGrantAndRevoke_TestContent(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
+                                 CONTENT_SETTING_ASK);
+#if defined(OS_ANDROID)
+  TestGrantAndRevoke_TestContent(
+      CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, CONTENT_SETTING_ASK);
+#endif
+}

content/browser/permissions/permission_service_impl.cc

@@ -114,14 +114,42 @@ void PermissionServiceImpl::HasPermission(
     const mojo::Callback<void(PermissionStatus)>& callback) {
   DCHECK(context_->GetBrowserContext());
 
+  callback.Run(GetPermissionStatus(PermissionNameToPermissionType(permission),
+                                   GURL(origin)));
+}
+
+void PermissionServiceImpl::RevokePermission(
+    PermissionName permission,
+    const mojo::String& origin,
+    const mojo::Callback<void(PermissionStatus)>& callback) {
+  GURL origin_url(origin);
+  PermissionType permission_type = PermissionNameToPermissionType(permission);
+  PermissionStatus status = GetPermissionStatus(permission_type, origin_url);
+
+  if (status != PERMISSION_STATUS_GRANTED)
+    callback.Run(status);
+
+  ResetPermissionStatus(permission_type, origin_url);
+
+  callback.Run(GetPermissionStatus(permission_type, origin_url));
+}
+
+PermissionStatus PermissionServiceImpl::GetPermissionStatus(PermissionType type,
+                                                            GURL origin) {
   // If the embedding_origin is empty we'll use |origin| instead.
   GURL embedding_origin = context_->GetEmbeddingOrigin();
+  return GetContentClient()->browser()->GetPermissionStatus(
+      type, context_->GetBrowserContext(), origin,
+      embedding_origin.is_empty() ? origin : embedding_origin);
+}
 
-  callback.Run(GetContentClient()->browser()->GetPermissionStatus(
-      PermissionNameToPermissionType(permission),
-      context_->GetBrowserContext(),
-      GURL(origin),
-      embedding_origin.is_empty() ? GURL(origin) : embedding_origin));
+void PermissionServiceImpl::ResetPermissionStatus(PermissionType type,
+                                                  GURL origin) {
+  // If the embedding_origin is empty we'll use |origin| instead.
+  GURL embedding_origin = context_->GetEmbeddingOrigin();
+  GetContentClient()->browser()->ResetPermission(
+      type, context_->GetBrowserContext(), origin,
+      embedding_origin.is_empty() ? origin : embedding_origin);
 }
 
 }  // namespace content

content/browser/permissions/permission_service_impl.h

@@ -52,6 +52,10 @@ class PermissionServiceImpl : public mojo::InterfaceImpl<PermissionService> {
       const mojo::String& origin,
       bool user_gesture,
       const mojo::Callback<void(PermissionStatus)>& callback) override;
+  void RevokePermission(
+      PermissionName permission,
+      const mojo::String& origin,
+      const mojo::Callback<void(PermissionStatus)>& callback) override;
 
   // mojo::InterfaceImpl.
   void OnConnectionError() override;
@@ -61,6 +65,9 @@ class PermissionServiceImpl : public mojo::InterfaceImpl<PermissionService> {
     int request_id,
     bool allowed);
 
+  PermissionStatus GetPermissionStatus(PermissionType type, GURL origin);
+  void ResetPermissionStatus(PermissionType type, GURL origin);
+
   RequestsMap pending_requests_;
   // context_ owns |this|.
   PermissionServiceContext* context_;

content/common/permission_service.mojom

@@ -21,4 +21,6 @@ interface PermissionService {
     => (PermissionStatus status);
   RequestPermission(PermissionName permission, string origin, bool user_gesture)
     => (PermissionStatus status);
+  RevokePermission(PermissionName permission, string origin)
+    => (PermissionStatus status);
 };

content/public/browser/content_browser_client.h

@@ -450,6 +450,11 @@ class CONTENT_EXPORT ContentBrowserClient {
       const GURL& requesting_origin,
       const GURL& embedding_origin);
 
+  virtual void ResetPermission(PermissionType permission,
+                               BrowserContext* browser_context,
+                               const GURL& requesting_origin,
+                               const GURL& embedding_origin) {}
+
   // Returns true if the given page is allowed to open a window of the given
   // type. If true is returned, |no_javascript_access| will indicate whether
   // the window that is created should be scriptable/in the same process.