Make Web Push use InstanceID tokens instead of GCM registrations

content/public/browser/push_messaging_service.cc

 // Copyright 2015 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.
 
 #include "content/public/browser/push_messaging_service.h"
 
 #include "base/callback.h"
 #include "content/browser/push_messaging/push_messaging_message_filter.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 41 matching lines @@
     scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
     int64_t service_worker_registration_id,
     const base::Closure& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   service_worker_context->ClearRegistrationUserData(
       service_worker_registration_id, {kPushRegistrationIdServiceWorkerKey},
       base::Bind(&CallClosureFromIO, callback));
 }
 
+void StorePushSubscriptionOnIOForTesting(
+    scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
+    int64_t service_worker_registration_id,
+    const GURL& origin,
+    const std::string& subscription_id,
+    const std::string& sender_id,
+    const base::Closure& callback) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  service_worker_context->StoreRegistrationUserData(
+      service_worker_registration_id, origin,
+      {{kPushRegistrationIdServiceWorkerKey, subscription_id},
+       {kPushSenderIdServiceWorkerKey, sender_id}},
+      base::Bind(&CallClosureFromIO, callback));
+}
+
 scoped_refptr<ServiceWorkerContextWrapper> GetServiceWorkerContext(
     BrowserContext* browser_context, const GURL& origin) {
   StoragePartition* partition =
       BrowserContext::GetStoragePartitionForSite(browser_context, origin);
   return make_scoped_refptr(
       static_cast<ServiceWorkerContextWrapper*>(
           partition->GetServiceWorkerContext()));
 }
 
 }  // anonymous namespace
@@ skipping 23 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&ClearPushSubscriptionIDOnIO,
                  GetServiceWorkerContext(browser_context, origin),
                  service_worker_registration_id,
                  callback));
 }
 
+// static
+void PushMessagingService::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) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  BrowserThread::PostTask(
+      BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(&StorePushSubscriptionOnIOForTesting,
+                 GetServiceWorkerContext(browser_context, origin),
+                 service_worker_registration_id,
+                 origin,
+                 subscription_id,
+                 sender_id,
+                 callback));
+}
+
 }  // namespace content