Make Service Worker DB UserData methods accept multiple keys at once

content/browser/service_worker/service_worker_database.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_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DATABASE_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DATABASE_H_
 
 #include <stdint.h>
 
-#include <map>
 #include <memory>
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/sequence_checker.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "url/gurl.h"
@@ skipping 141 matching lines @@
   // associated with it into the purgeable list. If deletion occurred, sets
   // |version_id| to the id of the version that was deleted and
   // |newly_purgeable_resources| to its resources; otherwise, sets |version_id|
   // to -1. Returns OK if it's successfully deleted or not found in the
   // database. Otherwise, returns an error.
   Status DeleteRegistration(int64_t registration_id,
                             const GURL& origin,
                             RegistrationData* deleted_version,
                             std::vector<int64_t>* newly_purgeable_resources);
 
-  // Reads user data for |registration_id| and |user_data_name| from the
+  // Reads user data for |registration_id| and |user_data_names| from the
   // database.

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

also document that the function returns OK only if all keys are found

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

Done.

   Status ReadUserData(int64_t registration_id,
-                      const std::string& user_data_name,
-                      std::string* user_data);
+                      const std::vector<std::string>& user_data_names,
+                      std::vector<std::string>* user_data_values);
 
-  // Writes |user_data| into the database. Returns NOT_FOUND if the registration
-  // specified by |registration_id| does not exist in the database.
-  Status WriteUserData(int64_t registration_id,
-                       const GURL& origin,
-                       const std::string& user_data_name,
-                       const std::string& user_data);
+  // Writes |name_value_pairs| into the database. Returns NOT_FOUND if the
+  // registration specified by |registration_id| does not exist in the database.
+  Status WriteUserData(
+      int64_t registration_id,
+      const GURL& origin,
+      const std::vector<std::pair<std::string, std::string>>& name_value_pairs);
 
-  // Deletes user data for |registration_id| and |user_data_name| from the
-  // database. Returns OK if it's successfully deleted or not found in the
+  // Deletes user data for |registration_id| and |user_data_names| from the
+  // database. Returns OK if all are successfully deleted or not found in the
   // database.
   Status DeleteUserData(int64_t registration_id,
-                        const std::string& user_data_name);
+                        const std::vector<std::string>& user_data_names);
 
   // Reads user data for all registrations that have data with |user_data_name|
   // from the database. Returns OK if they are successfully read or not found.
   Status ReadUserDataForAllRegistrations(
       const std::string& user_data_name,
       std::vector<std::pair<int64_t, std::string>>* user_data);
 
   // Resources should belong to one of following resource lists: uncommitted,
   // committed and purgeable.
   // As new resources are put into the diskcache, they go into the uncommitted
@@ skipping 176 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(ServiceWorkerDatabaseTest,
                            UserData_UninitializedDatabase);
   FRIEND_TEST_ALL_PREFIXES(ServiceWorkerDatabaseTest, DestroyDatabase);
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerDatabase);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DATABASE_H_