ServiceWorker: DB functions should return status code instead of boolean (2)

content/browser/service_worker/service_worker_storage.cc

Index: content/browser/service_worker/service_worker_storage.cc
diff --git a/content/browser/service_worker/service_worker_storage.cc b/content/browser/service_worker/service_worker_storage.cc
index 942214179893fa855970349282cb0b5b8b7d8ac9..efcdea4c22085a41ef5ef3b947486c356580d6df 100644
--- a/content/browser/service_worker/service_worker_storage.cc
+++ b/content/browser/service_worker/service_worker_storage.cc
@@ -125,9 +125,11 @@ void DeleteRegistrationFromDB(
   // TODO(nhiroki): Add convenient method to ServiceWorkerDatabase to check the
   // unique origin list.
   std::vector<ServiceWorkerDatabase::RegistrationData> registrations;
-  if (!database->GetRegistrationsForOrigin(origin, &registrations)) {
+  ServiceWorkerStatusCode status =
+      database->GetRegistrationsForOrigin(origin, &registrations);
+  if (status != SERVICE_WORKER_OK) {
     original_task_runner->PostTask(
-        FROM_HERE, base::Bind(callback, false, SERVICE_WORKER_ERROR_FAILED));
+        FROM_HERE, base::Bind(callback, false, status));
     return;
   }
 
@@ -528,9 +530,10 @@ void ServiceWorkerStorage::DidGetRegistrationsForPattern(
     const GURL& scope,
     const FindRegistrationCallback& callback,
     RegistrationList* registrations,
-    bool success) {
+    ServiceWorkerStatusCode status) {
   DCHECK(registrations);
-  if (!success) {
+  if (status != SERVICE_WORKER_OK) {
+    // TODO(nhiroki): Handle database error (http://crbug.com/371675).
     callback.Run(SERVICE_WORKER_ERROR_FAILED,

[michaeln, 2014/05/15 19:59:30]

should |status| be passed in here?

[nhiroki, 2014/05/16 02:11:11]

If we handle DB related errors like DB_CORRUPTED in this class, I think it would
be better not to propagate such errors to the upper class. Adding DB specific
error codes that you mentioned looks good. I'll try it in this CL.

                  scoped_refptr<ServiceWorkerRegistration>());
     return;
@@ -565,9 +568,10 @@ void ServiceWorkerStorage::DidGetRegistrationsForDocument(
     const GURL& document_url,
     const FindRegistrationCallback& callback,
     RegistrationList* registrations,
-    bool success) {
+    ServiceWorkerStatusCode status) {
   DCHECK(registrations);
-  if (!success) {
+  if (status != SERVICE_WORKER_OK) {
+    // TODO(nhiroki): Handle database error (http://crbug.com/371675).
     callback.Run(SERVICE_WORKER_ERROR_FAILED,

[michaeln, 2014/05/15 19:59:30]

ditto |status|? dunno if it should just asking

                  scoped_refptr<ServiceWorkerRegistration>());
     return;
@@ -634,9 +638,10 @@ void ServiceWorkerStorage::DidReadRegistrationForId(
 void ServiceWorkerStorage::DidGetAllRegistrations(
     const GetAllRegistrationInfosCallback& callback,
     RegistrationList* registrations,
-    bool success) {
+    ServiceWorkerStatusCode status) {
   DCHECK(registrations);
-  if (!success) {
+  if (status != SERVICE_WORKER_OK) {
+    // TODO(nhiroki): Handle database error (http://crbug.com/371675).
     callback.Run(std::vector<ServiceWorkerRegistrationInfo>());
     return;
   }