Permissions: Move common logic from DecidePermission to RequestPermission

chrome/browser/push_messaging/push_messaging_permission_context.cc

Index: chrome/browser/push_messaging/push_messaging_permission_context.cc
diff --git a/chrome/browser/push_messaging/push_messaging_permission_context.cc b/chrome/browser/push_messaging/push_messaging_permission_context.cc
index ab2194a3e2a234519da78cd375c7ba5c3251a23e..95161073e80be8fc8a1178220f961208e23b168a 100644
--- a/chrome/browser/push_messaging/push_messaging_permission_context.cc
+++ b/chrome/browser/push_messaging/push_messaging_permission_context.cc
@@ -65,8 +65,9 @@ ContentSetting PushMessagingPermissionContext::GetPermissionStatus(
 //  - 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.
+//  - If those 3 things are true it is granted without prompting.
 // This is done to avoid double prompting for notifications and push.
+// TODO: CHECK THIS

[mlamouri (slow - plz ping), 2015/11/26 12:45:49]

I don't think anything else is required.

[johnme, 2015/11/26 18:28:48]

Removed TODO.

 void PushMessagingPermissionContext::DecidePermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
@@ -82,13 +83,6 @@ void PushMessagingPermissionContext::DecidePermission(
     return;
   }
 
-  if (IsRestrictedToSecureOrigins() &&
-      !content::IsOriginSecure(requesting_origin)) {
-    NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
-                        false /* persist */, CONTENT_SETTING_BLOCK);
-    return;
-  }
-
   NotificationPermissionContext* notification_context =
       NotificationPermissionContextFactory::GetForProfile(profile_);
   DCHECK(notification_context);