Make Web Push use InstanceID tokens instead of GCM registrations

content/public/browser/push_messaging_service.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 CONTENT_PUBLIC_BROWSER_PUSH_MESSAGING_SERVICE_H_
 #define CONTENT_PUBLIC_BROWSER_PUSH_MESSAGING_SERVICE_H_
 
 #include <stdint.h>
 #include <string>
 #include <vector>
@@ skipping 49 matching lines @@
 
   // Subscribe the given |options.sender_info| with the push messaging service.
   // The frame is not known so if permission was not previously granted by the
   // user this request should fail.
   virtual void SubscribeFromWorker(const GURL& requesting_origin,
                                    int64_t service_worker_registration_id,
                                    const PushSubscriptionOptions& options,
                                    const RegisterCallback& callback) = 0;
 
   // Retrieves the encryption information associated with the subscription
-  // associated to |origin| and |service_worker_registration_id|.
+  // associated to |origin| and |service_worker_registration_id|. |sender_id| is
+  // also required since an InstanceID might have multiple tokens associated
+  // with different senders, though in practice Push doesn't yet use that.
   virtual void GetEncryptionInfo(const GURL& origin,
                                  int64_t service_worker_registration_id,
+                                 const std::string& sender_id,
                                  const EncryptionInfoCallback& callback) = 0;
 
   // Unsubscribe the given |sender_id| from the push messaging service. The
   // subscription will be synchronously deactivated locally, and asynchronously
   // sent to the push service, with automatic retry.
   virtual void Unsubscribe(const GURL& requesting_origin,
                            int64_t service_worker_registration_id,
                            const std::string& sender_id,
                            const UnregisterCallback& callback) = 0;
 
@@ skipping 14 matching lines @@
                           const GURL& origin,
                           int64_t service_worker_registration_id,
                           const StringCallback& callback);
 
   // Clear the push subscription id stored in the service worker with the given
   // |service_worker_registration_id| for the given |origin|.
   static void ClearPushSubscriptionID(BrowserContext* browser_context,
                                       const GURL& origin,
                                       int64_t service_worker_registration_id,
                                       const base::Closure& callback);
+
+  // Stores a push subscription in the service worker for the given |origin|.
+  // Must only be used by tests.
+  static void StorePushSubscriptionForTesting(
+      BrowserContext* browser_context,
+      const GURL& origin,
+      int64_t service_worker_registration_id,
+      const std::string& subscription_id,
+      const std::string& sender_id,
+      const base::Closure& callback);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_PUSH_MESSAGING_SERVICE_H_