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 61 matching lines @@
   // associated to |origin| and |service_worker_registration_id|.
   virtual void GetEncryptionInfo(const GURL& origin,
                                  int64_t service_worker_registration_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;
 
   // Checks the permission status for the |origin|. The |user_visible| boolean
   // indicates whether the permission status only has to cover push messages
   // resulting in visible effects to the user.
   virtual blink::WebPushPermissionStatus GetPermissionStatus(
       const GURL& origin,
       bool user_visible) = 0;
 
   // Returns whether subscriptions that do not mandate user visible UI upon
@@ skipping 10 matching lines @@
       int64_t service_worker_registration_id,
       const StringCallback& callback);
   static void SetNotificationsShownByLastFewPushes(
       ServiceWorkerContext* service_worker_context,
       int64_t service_worker_registration_id,
       const GURL& origin,
       const std::string& notifications_shown,
       const ResultCallback& callback);
 
  protected:
-  static void GetSenderId(BrowserContext* browser_context,
-                          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);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_PUSH_MESSAGING_SERVICE_H_