Clean-up refactoring of chrome_content_browser_client to use GetPermissionContext consistently.

chrome/browser/services/gcm/push_messaging_permission_context.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/services/gcm/push_messaging_permission_context.h"
 
 #include "chrome/browser/content_settings/permission_context_uma_util.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 45 matching lines @@
     return CONTENT_SETTING_ASK;
   }
   DCHECK_EQ(CONTENT_SETTING_ALLOW, notifications_permission);
   DCHECK_EQ(CONTENT_SETTING_ALLOW, push_content_setting);
   return CONTENT_SETTING_ALLOW;
 #else
   return CONTENT_SETTING_BLOCK;
 #endif
 }
 
+void PushMessagingPermissionContext::CancelPermissionRequest(
+    content::WebContents* web_contents, const PermissionRequestID& id) {
+  NOTIMPLEMENTED() << "CancelPermission not implemented for push messaging";

[Peter Beverloo, 2015/02/04 14:56:53]

Does Push need to implement CancelPermissionRequest manually because it defers
to notifications? If so, please add a TODO in my name to fix this.

Otherwise, would you mind clarifying? I notice that other overrides of
CancelPermissionRequest add custom logic prior to falling back to
PermissionContextBase::CancelPermissionRequest, which can cancel the permission
bubble or infobar based on |id|, which we also feed to the Notification request
permission system. Shouldn't it just work?

[timvolodine, 2015/02/04 16:15:37]

This was actually meant as a refactoring, and I added this NOTIMPLEMENTED
because it was in the original switch statement in
chrome_content_browser_client.

I think currently only geolocation overrides CancelPermissionRequest. Not sure
why push currently has no support for cancel. Maybe this is related to
crbug.com/453788, where as I understand it there is no infobar to cancel in case
of push permissions..

Anyways I think the fix for this should be in a separate patch. Added a TODO in
your name as you suggested. Do we need a crbug for this?

+}
+
 // Unlike other permissions, push is decided by the following algorithm
 //  - You need to request it from a top level domain
 //  - You need to have notification permission granted.
 //  - You need to not have push permission explicitly blocked.
 //  - If those two things are true it is granted without prompting.
 // This is done to avoid double prompting for notifications and push.
 void PushMessagingPermissionContext::DecidePermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_origin,
@@ skipping 51 matching lines @@
     return;
   }
 
   PermissionContextUmaUtil::PermissionGranted(kPushSettingType,
                                               requesting_origin);
   NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                       true /* persist */, true /* granted */);
 }
 }  // namespace gcm