ServiceWorker: ReadRegistration should return NOT_FOUND when the database is not initialized

content/browser/service_worker/service_worker_database.cc

 // 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.
 
 #include "content/browser/service_worker/service_worker_database.h"
 
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 487 matching lines @@
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadRegistration(
     int64 registration_id,
     const GURL& origin,
     RegistrationData* registration,
     std::vector<ResourceRecord>* resources) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   DCHECK(registration);
   DCHECK(resources);
 
   Status status = LazyOpen(false);
-  if (IsNewOrNonexistentDatabase(status) || status != STATUS_OK)
+  if (IsNewOrNonexistentDatabase(status))
+    return STATUS_ERROR_NOT_FOUND;
+  if (status != STATUS_OK)
     return status;
 
   RegistrationData value;
   status = ReadRegistrationData(registration_id, origin, &value);
   if (status != STATUS_OK)
     return status;
 
   status = ReadResourceRecords(value.version_id, resources);
   if (status != STATUS_OK)
     return status;
@@ skipping 182 matching lines @@
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadUserData(
     int64 registration_id,
     const std::string& user_data_name,
     std::string* user_data) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   DCHECK_NE(kInvalidServiceWorkerRegistrationId, registration_id);
   DCHECK(!user_data_name.empty());
   DCHECK(user_data);
 
   Status status = LazyOpen(false);
-  if (IsNewOrNonexistentDatabase(status) || status != STATUS_OK)
+  if (IsNewOrNonexistentDatabase(status))
+    return STATUS_ERROR_NOT_FOUND;
+  if (status != STATUS_OK)
     return status;
 
   const std::string key = CreateUserDataKey(registration_id, user_data_name);
   status = LevelDBStatusToStatus(
       db_->Get(leveldb::ReadOptions(), key, user_data));
   HandleReadResult(FROM_HERE,
                    status == STATUS_ERROR_NOT_FOUND ? STATUS_OK : status);
   return status;
 }
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteUserData(
     int64 registration_id,
     const GURL& origin,
     const std::string& user_data_name,
     const std::string& user_data) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   DCHECK_NE(kInvalidServiceWorkerRegistrationId, registration_id);
   DCHECK(!user_data_name.empty());
 
   Status status = LazyOpen(false);
-  if (IsNewOrNonexistentDatabase(status) || status != STATUS_OK)
+  if (IsNewOrNonexistentDatabase(status))
+    return STATUS_ERROR_NOT_FOUND;
+  if (status != STATUS_OK)
     return status;
 
   // There should be the registration specified by |registration_id|.
   RegistrationData registration;
   status = ReadRegistrationData(registration_id, origin, &registration);
   if (status != STATUS_OK)
     return status;
 
   leveldb::WriteBatch batch;
   batch.Put(CreateUserDataKey(registration_id, user_data_name), user_data);
@@ skipping 586 matching lines @@
 
 void ServiceWorkerDatabase::HandleWriteResult(
     const tracked_objects::Location& from_here,
     Status status) {
   if (status != STATUS_OK)
     Disable(from_here, status);
   ServiceWorkerMetrics::CountWriteDatabaseResult(status);
 }
 
 }  // namespace content