Make Service Worker DB UserData methods accept multiple keys at once

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"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 
 namespace content {
 
 namespace {
 
 void CallStringCallbackFromIO(
     const PushMessagingService::StringCallback& callback,
-    const std::string& data,
+    const std::vector<std::string>& data,
     ServiceWorkerStatusCode service_worker_status) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);

[michaeln, 2016/05/03 19:38:06]

maybe DCHECK_LE(data.size(), 1)

[johnme, 2016/05/05 10:54:04]

I put a DCHECK_EQ(1u, data.size()); in the success case

   bool success = service_worker_status == SERVICE_WORKER_OK;
   bool not_found = service_worker_status == SERVICE_WORKER_ERROR_NOT_FOUND;
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-                          base::Bind(callback, data, success, not_found));
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(callback, success ? data[0] : std::string(), success,
+                 not_found));
 }
 
 void CallClosureFromIO(const base::Closure& callback,
                        ServiceWorkerStatusCode status) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
 }
 
 void GetUserDataOnIO(
     scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_wrapper,
     int64_t service_worker_registration_id,
     const std::string& key,
     const PushMessagingService::StringCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   service_worker_context_wrapper->GetRegistrationUserData(
-      service_worker_registration_id, key,
+      service_worker_registration_id, {key},
       base::Bind(&CallStringCallbackFromIO, callback));
 }
 
 void ClearPushSubscriptionIDOnIO(
     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,
+      service_worker_registration_id, {kPushRegistrationIdServiceWorkerKey},
       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()));
@@ skipping 27 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&ClearPushSubscriptionIDOnIO,
                  GetServiceWorkerContext(browser_context, origin),
                  service_worker_registration_id,
                  callback));
 }
 
 }  // namespace content