Make Service Worker DB UserData methods accept multiple keys at once

content/public/browser/push_messaging_service.cc

Index: content/public/browser/push_messaging_service.cc
diff --git a/content/public/browser/push_messaging_service.cc b/content/public/browser/push_messaging_service.cc
index ea5058cf66adfccd717478c2c56ce1294cc075b9..79043c21624dcacc6b9cbd5ae74b4d7de518b051 100644
--- a/content/public/browser/push_messaging_service.cc
+++ b/content/public/browser/push_messaging_service.cc
@@ -17,13 +17,15 @@ 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,
@@ -39,7 +41,7 @@ void GetUserDataOnIO(
     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));
 }
 
@@ -50,8 +52,7 @@ void ClearPushSubscriptionIDOnIO(
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   service_worker_context->ClearRegistrationUserData(
-      service_worker_registration_id,
-      kPushRegistrationIdServiceWorkerKey,
+      service_worker_registration_id, {kPushRegistrationIdServiceWorkerKey},
       base::Bind(&CallClosureFromIO, callback));
 }