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

chrome/browser/push_messaging/push_messaging_service_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
 #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
 
 #include <stdint.h>
 #include <set>
 #include <vector>
@@ skipping 125 matching lines @@
   void SubscribeEndWithError(
       const content::PushMessagingService::RegisterCallback& callback,
       content::PushRegistrationStatus status);
 
   void DidSubscribe(
       const PushMessagingAppIdentifier& app_identifier,
       const content::PushMessagingService::RegisterCallback& callback,
       const std::string& subscription_id,
       gcm::GCMClient::Result result);
 
+  void DidSubscribeWithPublicEncryptionKey(
+      const PushMessagingAppIdentifier& app_identifier,
+      const content::PushMessagingService::RegisterCallback& callback,
+      const std::string& subscription_id,
+      const std::vector<uint8_t>& public_key);
+
   void DidRequestPermission(
       const PushMessagingAppIdentifier& app_identifier,
       const std::string& sender_id,
       const content::PushMessagingService::RegisterCallback& callback,
       content::PermissionStatus permission_status);
 
   // Unsubscribe methods -------------------------------------------------------
 
   void Unsubscribe(const std::string& app_id,
                    const std::string& sender_id,
                    const content::PushMessagingService::UnregisterCallback&);
 
   void DidUnsubscribe(bool was_subscribed,
                       const content::PushMessagingService::UnregisterCallback&,
                       gcm::GCMClient::Result result);
 
+  // GetPublicEncryptionKey method ---------------------------------------------
+
+  void DidGetPublicEncryptionKey(
+      const PushMessagingService::PublicKeyCallback& callback,
+      const std::vector<uint8_t>& public_key) const;
+
   // OnContentSettingChanged methods -------------------------------------------
 
   void UnsubscribeBecausePermissionRevoked(
       const PushMessagingAppIdentifier& app_identifier,
       const base::Closure& closure,
       const std::string& sender_id,
       bool success,
       bool not_found);
 
   // Helper methods ------------------------------------------------------------
 
   // Checks if a given origin is allowed to use Push.
   bool IsPermissionSet(const GURL& origin);
 
+  // Returns whether incoming messages should support payloads.
+  bool EnableMessagePayloads() const;

[jianli, 2015/07/17 20:55:21]

EnableMessagePayloads sounds more like an action. How about
IsMessagePayloadsEnabled?

[Peter Beverloo, 2015/07/20 17:55:53]

Done.

+
   gcm::GCMDriver* GetGCMDriver() const;
 
   Profile* profile_;
 
   int push_subscription_count_;
   int pending_push_subscription_count_;
 
   base::Closure message_callback_for_testing_;
   base::Closure content_setting_changed_callback_for_testing_;
 
 #if defined(ENABLE_NOTIFICATIONS)
   PushMessagingNotificationManager notification_manager_;
 #endif
 
   // A multiset containing one entry for each in-flight push message delivery,
   // keyed by the receiver's app id.
   std::multiset<std::string> in_flight_message_deliveries_;
 
   base::WeakPtrFactory<PushMessagingServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PushMessagingServiceImpl);
 };
 
 #endif  // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_