Hook up the Push API with GCM's new ability to own encryption keys.

chrome/browser/push_messaging/push_messaging_service_impl.h

Index: chrome/browser/push_messaging/push_messaging_service_impl.h
diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.h b/chrome/browser/push_messaging/push_messaging_service_impl.h
index 333497c2725b5e76160cd1ab956befc55ba6c42d..8aec256175ccc6aa1252a1b6283aa22230ec2397 100644
--- a/chrome/browser/push_messaging/push_messaging_service_impl.h
+++ b/chrome/browser/push_messaging/push_messaging_service_impl.h
@@ -143,6 +143,12 @@ class PushMessagingServiceImpl : public content::PushMessagingService,
       const std::string& subscription_id,
       gcm::GCMClient::Result result);
 
+  void DidSubscribeWithPublicKey(
+      const PushMessagingAppIdentifier& app_identifier,
+      const content::PushMessagingService::RegisterCallback& callback,
+      const std::string& subscription_id,
+      const std::string& public_key);
+
   void DidRequestPermission(
       const PushMessagingAppIdentifier& app_identifier,
       const std::string& sender_id,
@@ -159,6 +165,12 @@ class PushMessagingServiceImpl : public content::PushMessagingService,
                       const content::PushMessagingService::UnregisterCallback&,
                       gcm::GCMClient::Result result);
 
+  // GetPublicEncryptionKey method ---------------------------------------------

[johnme, 2015/07/21 15:37:26]

Nit: GetPublicEncryptionKey is declared between Subscribe and Unsubscribe (above
and in the superclass), so please put GetPublicEncryptionKey method between
Subscribe methods and Unsubscribe methods for consistency.

[Peter Beverloo, 2015/07/21 15:51:08]

Done.

+
+  void DidGetPublicKey(
+      const PushMessagingService::PublicKeyCallback& callback,
+      const std::string& public_key) const;
+
   // OnContentSettingChanged methods -------------------------------------------
 
   void UnsubscribeBecausePermissionRevoked(
@@ -173,6 +185,9 @@ class PushMessagingServiceImpl : public content::PushMessagingService,
   // Checks if a given origin is allowed to use Push.
   bool IsPermissionSet(const GURL& origin);
 
+  // Returns whether incoming messages should support payloads.
+  bool AreMessagePayloadsEnabled() const;
+
   gcm::GCMDriver* GetGCMDriver() const;
 
   Profile* profile_;