Move IndexedDB files out of in_process_webkit

content/browser/indexed_db/indexed_db_database.cc

 // Copyright (c) 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/indexed_db/indexed_db_database.h"
 
 #include <math.h>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 1578 matching lines @@
 
   // We infer that the database didn't exist from its lack of either type of
   // version.
   bool is_new_database =
       metadata_.version == kNoStringVersion &&
       metadata_.int_version == IndexedDBDatabaseMetadata::NO_INT_VERSION;
 
   if (version == IndexedDBDatabaseMetadata::DEFAULT_INT_VERSION) {
     // For unit tests only - skip upgrade steps. Calling from script with
     // DEFAULT_INT_VERSION throws exception.
-    DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));

[jsbell, 2013/06/26 17:40:33]

This DCHECK actually landed in parallel with the thread move (it was previously
a TODO). It's now a bogus check since the IDB code is never on the WEBKIT
thread. Restore it to a TODO.

+    // TODO(jsbell): DCHECK that not in unit tests.
     DCHECK(is_new_database);
     database_callbacks_set_.insert(database_callbacks);
     callbacks->OnSuccess(this, this->metadata());
     return;
   }
 
   if (version == IndexedDBDatabaseMetadata::NO_INT_VERSION) {
     if (!is_new_database) {
       database_callbacks_set_.insert(database_callbacks);
       callbacks->OnSuccess(this, this->metadata());
@@ skipping 189 matching lines @@
   ProcessPendingCalls();
 
   // TODO(jsbell): Add a test for the pending_open_calls_ cases below.
   if (!ConnectionCount() && !pending_open_calls_.size() &&
       !pending_delete_calls_.size()) {
     DCHECK(transactions_.empty());
 
     backing_store_ = NULL;
 
     // factory_ should only be null in unit tests.
-    DCHECK(factory_ ||
-           !BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));

[jsbell, 2013/06/26 17:40:33]

Ditto.

+    // TODO(jsbell): DCHECK(factory_ || !in_unit_tests) - somehow.
     if (factory_.get())
       factory_->RemoveIDBDatabaseBackend(identifier_);
   }
 }
 
 void CreateObjectStoreAbortOperation::Perform(
     IndexedDBTransaction* transaction) {
   IDB_TRACE("CreateObjectStoreAbortOperation");
   DCHECK(!transaction);
   database_->RemoveObjectStore(object_store_id_);
 }
 
 void DeleteObjectStoreAbortOperation::Perform(
     IndexedDBTransaction* transaction) {
   IDB_TRACE("DeleteObjectStoreAbortOperation");
   DCHECK(!transaction);
   database_->AddObjectStore(object_store_metadata_,
                             IndexedDBObjectStoreMetadata::kInvalidId);
 }
 
 void IndexedDBDatabase::VersionChangeAbortOperation::Perform(
     IndexedDBTransaction* transaction) {
   IDB_TRACE("VersionChangeAbortOperation");
   DCHECK(!transaction);
   database_->metadata_.version = previous_version_;
   database_->metadata_.int_version = previous_int_version_;
 }
 
 }  // namespace content