Change ServiceWorkerStorage::GetUserDataInDBCallback to remove indirection

The order of |values| and |status| is different in GetUserDataCallback
and GetUserDataInDBCallback, so it is standardized to (status, values).
Hence, the helper function in control_impl.cc can also be removed.

Bug: 1055677
Change-Id: Ia469fa2b8e6212a8d3fe7d50bbb56e356b4a6def
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2206860Reviewed-by: Kenichi Ishibashi <bashi@chromium.org>
Commit-Queue: Kenichi Ishibashi <bashi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770883}

content/browser/service_worker/service_worker_registry.cc

@@ -1231,8 +1231,8 @@ void ServiceWorkerRegistry::DidDoomUncommittedResourceIds(
 
 void ServiceWorkerRegistry::DidGetUserData(
     GetUserDataCallback callback,
-    const std::vector<std::string>& data,
-    storage::mojom::ServiceWorkerDatabaseStatus status) {
+    storage::mojom::ServiceWorkerDatabaseStatus status,
+    const std::vector<std::string>& data) {
   if (status != storage::mojom::ServiceWorkerDatabaseStatus::kOk &&
       status != storage::mojom::ServiceWorkerDatabaseStatus::kErrorNotFound) {
     ScheduleDeleteAndStartOver();

content/browser/service_worker/service_worker_registry.h

@@ -311,8 +311,8 @@ class CONTENT_EXPORT ServiceWorkerRegistry {
       const std::set<int64_t>& resource_ids,
       storage::mojom::ServiceWorkerDatabaseStatus status);
   void DidGetUserData(GetUserDataCallback callback,
-                      const std::vector<std::string>& data,
-                      storage::mojom::ServiceWorkerDatabaseStatus status);
+                      storage::mojom::ServiceWorkerDatabaseStatus status,
+                      const std::vector<std::string>& data);
   void DidGetUserKeysAndData(
       GetUserKeysAndDataCallback callback,
       const base::flat_map<std::string, std::string>& data_map,

content/browser/service_worker/service_worker_storage.cc

@@ -576,8 +576,9 @@ void ServiceWorkerStorage::GetUserData(int64_t registration_id,
   switch (state_) {
     case STORAGE_STATE_DISABLED:
       RunSoon(FROM_HERE,
-              base::BindOnce(std::move(callback), std::vector<std::string>(),
-                             ServiceWorkerDatabase::Status::kErrorDisabled));
+              base::BindOnce(std::move(callback),
+                             ServiceWorkerDatabase::Status::kErrorDisabled,
+                             std::vector<std::string>()));
       return;
     case STORAGE_STATE_INITIALIZING:  // Fall-through.
     case STORAGE_STATE_UNINITIALIZED:
@@ -608,8 +609,9 @@ void ServiceWorkerStorage::GetUserDataByKeyPrefix(
   switch (state_) {
     case STORAGE_STATE_DISABLED:
       RunSoon(FROM_HERE,
-              base::BindOnce(std::move(callback), std::vector<std::string>(),
-                             ServiceWorkerDatabase::Status::kErrorDisabled));
+              base::BindOnce(std::move(callback),
+                             ServiceWorkerDatabase::Status::kErrorDisabled,
+                             std::vector<std::string>()));
       return;
     case STORAGE_STATE_INITIALIZING:  // Fall-through.
     case STORAGE_STATE_UNINITIALIZED:
@@ -1494,7 +1496,7 @@ void ServiceWorkerStorage::GetUserDataInDB(
   ServiceWorkerDatabase::Status status =
       database->ReadUserData(registration_id, keys, &values);
   original_task_runner->PostTask(
-      FROM_HERE, base::BindOnce(std::move(callback), values, status));
+      FROM_HERE, base::BindOnce(std::move(callback), status, values));
 }
 
 void ServiceWorkerStorage::GetUserDataByKeyPrefixInDB(
@@ -1507,7 +1509,7 @@ void ServiceWorkerStorage::GetUserDataByKeyPrefixInDB(
   ServiceWorkerDatabase::Status status =
       database->ReadUserDataByKeyPrefix(registration_id, key_prefix, &values);
   original_task_runner->PostTask(
-      FROM_HERE, base::BindOnce(std::move(callback), values, status));
+      FROM_HERE, base::BindOnce(std::move(callback), status, values));
 }
 
 void ServiceWorkerStorage::GetUserKeysAndDataByKeyPrefixInDB(

content/browser/service_worker/service_worker_storage.h

@@ -99,8 +99,7 @@ class CONTENT_EXPORT ServiceWorkerStorage {
   using DatabaseStatusCallback =
       base::OnceCallback<void(ServiceWorkerDatabase::Status status)>;
   using GetUserDataInDBCallback =
-      base::OnceCallback<void(const std::vector<std::string>& data,
-                              ServiceWorkerDatabase::Status)>;
+      storage::mojom::ServiceWorkerStorageControl::GetUserDataCallback;
   using GetUserKeysAndDataInDBCallback = base::OnceCallback<void(
       const base::flat_map<std::string, std::string>& data_map,
       ServiceWorkerDatabase::Status)>;

content/browser/service_worker/service_worker_storage_control_impl.cc

@@ -68,15 +68,6 @@ void DidGetRegistrationsForOrigin(
   std::move(callback).Run(status, std::move(registrations));
 }
 
-void DidGetUserData(
-    ServiceWorkerStorageControlImpl::GetUserDataCallback callback,
-    const std::vector<std::string>& values,
-    storage::mojom::ServiceWorkerDatabaseStatus status) {
-  // TODO(bashi): Change ServiceWorkerStorage::GetUserDataInDBCallback to remove
-  // this indirection (the order of |values| and |status| is different).
-  std::move(callback).Run(status, values);
-}
-
 void DidGetKeysAndUserData(
     ServiceWorkerStorageControlImpl::GetUserKeysAndDataByKeyPrefixCallback
         callback,
@@ -251,8 +242,7 @@ void ServiceWorkerStorageControlImpl::GetUserData(
     int64_t registration_id,
     const std::vector<std::string>& keys,
     GetUserDataCallback callback) {
-  storage_->GetUserData(registration_id, keys,
-                        base::BindOnce(&DidGetUserData, std::move(callback)));
+  storage_->GetUserData(registration_id, keys, std::move(callback));
 }
 
 void ServiceWorkerStorageControlImpl::StoreUserData(
@@ -275,9 +265,8 @@ void ServiceWorkerStorageControlImpl::GetUserDataByKeyPrefix(
     int64_t registration_id,
     const std::string& key_prefix,
     GetUserDataByKeyPrefixCallback callback) {
-  storage_->GetUserDataByKeyPrefix(
-      registration_id, key_prefix,
-      base::BindOnce(&DidGetUserData, std::move(callback)));
+  storage_->GetUserDataByKeyPrefix(registration_id, key_prefix,
+                                   std::move(callback));
 }
 
 void ServiceWorkerStorageControlImpl::GetUserKeysAndDataByKeyPrefix(