ServiceWorker: Database functions should return status code instead of boolean

content/browser/service_worker/service_worker_storage.cc

 // Copyright 2013 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/browser/service_worker/service_worker_storage.h"
 
 #include <string>
 
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_disk_cache.h"
 #include "content/browser/service_worker/service_worker_info.h"
 #include "content/browser/service_worker/service_worker_registration.h"
 #include "content/browser/service_worker/service_worker_utils.h"
 #include "content/browser/service_worker/service_worker_version.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_errors.h"
 #include "webkit/browser/quota/quota_manager_proxy.h"
 
 namespace content {
 
 namespace {
 
 typedef base::Callback<void(
     ServiceWorkerStorage::InitialData* data,
-    bool success)> InitializeCallback;
+    ServiceWorkerStatusCode status)> InitializeCallback;
 typedef base::Callback<void(
     const ServiceWorkerDatabase::RegistrationData& data,
     const std::vector<ServiceWorkerDatabase::ResourceRecord>& resources,
     ServiceWorkerStatusCode status)> ReadRegistrationCallback;
 typedef base::Callback<void(
     bool origin_is_deletable,
     ServiceWorkerStatusCode status)> DeleteRegistrationCallback;
 
 void RunSoon(const tracked_objects::Location& from_here,
              const base::Closure& closure) {
@@ skipping 22 matching lines @@
 
 const int kMaxMemDiskCacheSize = 10 * 1024 * 1024;
 
 void EmptyCompletionCallback(int) {}
 
 void ReadInitialDataFromDB(
     ServiceWorkerDatabase* database,
     scoped_refptr<base::SequencedTaskRunner> original_task_runner,
     const InitializeCallback& callback) {
   DCHECK(database);
-  ServiceWorkerStorage::InitialData* data =
-      new ServiceWorkerStorage::InitialData();
-  bool success =
+  scoped_ptr<ServiceWorkerStorage::InitialData> data(
+      new ServiceWorkerStorage::InitialData());
+
+  ServiceWorkerStatusCode status =
       database->GetNextAvailableIds(&data->next_registration_id,
                                     &data->next_version_id,
-                                    &data->next_resource_id) &&
-      database->GetOriginsWithRegistrations(&data->origins);
+                                    &data->next_resource_id);
+  if (status != SERVICE_WORKER_OK) {
+    original_task_runner->PostTask(
+        FROM_HERE, base::Bind(callback, base::Owned(data.release()), status));
+    return;
+  }
+
+  status = database->GetOriginsWithRegistrations(&data->origins);
   original_task_runner->PostTask(
-      FROM_HERE, base::Bind(callback, base::Owned(data), success));
+      FROM_HERE, base::Bind(callback, base::Owned(data.release()), status));
 }
 
 void ReadRegistrationFromDB(
     ServiceWorkerDatabase* database,
     scoped_refptr<base::SequencedTaskRunner> original_task_runner,
     int64 registration_id,
     const GURL& origin,
     const ReadRegistrationCallback& callback) {
   DCHECK(database);
   ServiceWorkerDatabase::RegistrationData data;
@@ skipping 393 matching lines @@
       base::Bind(&ReadInitialDataFromDB,
                  database_.get(),
                  base::MessageLoopProxy::current(),
                  base::Bind(&ServiceWorkerStorage::DidReadInitialData,
                             weak_factory_.GetWeakPtr())));
   return false;
 }
 
 void ServiceWorkerStorage::DidReadInitialData(
     InitialData* data,
-    bool success) {
+    ServiceWorkerStatusCode status) {
   DCHECK(data);
   DCHECK_EQ(INITIALIZING, state_);
 
-  if (success) {
+  if (status == SERVICE_WORKER_OK) {
     next_registration_id_ = data->next_registration_id;
     next_version_id_ = data->next_version_id;
     next_resource_id_ = data->next_resource_id;
     registered_origins_.swap(data->origins);
     state_ = INITIALIZED;
   } else {
-    DLOG(WARNING) << "Failed to initialize.";
+    // TODO(nhiroki): If status==SERVICE_WORKER_ERROR_DB_CORRUPTED, do
+    // corruption recovery (http://crbug.com/371675).
+    DLOG(WARNING) << "Failed to initialize: "
+                  << ServiceWorkerStatusToString(status);
     state_ = DISABLED;
   }
 
   for (std::vector<base::Closure>::const_iterator it = pending_tasks_.begin();
        it != pending_tasks_.end(); ++it) {
     RunSoon(FROM_HERE, *it);
   }
   pending_tasks_.clear();
 }
 
@@ skipping 243 matching lines @@
   // TODO(michaeln): Store data on disk and do error checking.
   disk_cache_.reset(new ServiceWorkerDiskCache);
   int rv = disk_cache_->InitWithMemBackend(
       kMaxMemDiskCacheSize,
       base::Bind(&EmptyCompletionCallback));
   DCHECK_EQ(net::OK, rv);
   return disk_cache_.get();
 }
 
 }  // namespace content