IndexedDB: Eliminate interfaces for IndexedDB{Factory,Database,Cursor}

content/browser/indexed_db/indexed_db_factory.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_factory_impl.h"
+#include "content/browser/indexed_db/indexed_db_factory.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
-#include "content/browser/indexed_db/indexed_db_database_impl.h"
+#include "content/browser/indexed_db/indexed_db_database.h"
 #include "content/browser/indexed_db/indexed_db_tracing.h"
 #include "content/browser/indexed_db/indexed_db_transaction_coordinator.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabaseException.h"
 
 namespace content {
 
 template <typename K, typename M>
 static void CleanWeakMap(std::map<K, base::WeakPtr<M> >* map) {
   std::map<K, base::WeakPtr<M> > other;
   other.swap(*map);
@@ skipping 11 matching lines @@
   string16 result(database_identifier);
   result.insert(result.end(), suffix.begin(), suffix.end());
   return result;
 }
 
 static string16 ComputeUniqueIdentifier(const string16& name,
                                         const string16& database_identifier) {
   return ComputeFileIdentifier(database_identifier) + name;
 }
 
-IndexedDBFactoryImpl::IndexedDBFactoryImpl() {}
+IndexedDBFactory::IndexedDBFactory() {}
 
-IndexedDBFactoryImpl::~IndexedDBFactoryImpl() {}
+IndexedDBFactory::~IndexedDBFactory() {}
 
-void IndexedDBFactoryImpl::RemoveIDBDatabaseBackend(
+void IndexedDBFactory::RemoveIDBDatabaseBackend(
     const string16& unique_identifier) {
   DCHECK(database_backend_map_.find(unique_identifier) !=
          database_backend_map_.end());
   database_backend_map_.erase(unique_identifier);
 }
 
-void IndexedDBFactoryImpl::GetDatabaseNames(
+void IndexedDBFactory::GetDatabaseNames(
     scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
     const string16& database_identifier,
     const base::FilePath& data_directory) {
-  IDB_TRACE("IndexedDBFactoryImpl::get_database_names");
+  IDB_TRACE("IndexedDBFactory::get_database_names");
   scoped_refptr<IndexedDBBackingStore> backing_store =
       OpenBackingStore(database_identifier, data_directory);
   if (!backing_store) {
-    callbacks->OnError(IndexedDBDatabaseError(
-        WebKit::WebIDBDatabaseExceptionUnknownError,
-        "Internal error opening backing store for "
-        "indexedDB.webkitGetDatabaseNames."));
+    callbacks->OnError(
+        IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError,
+                               "Internal error opening backing store for "
+                               "indexedDB.webkitGetDatabaseNames."));
     return;
   }
 
   callbacks->OnSuccess(backing_store->GetDatabaseNames());
 }
 
-void IndexedDBFactoryImpl::DeleteDatabase(
+void IndexedDBFactory::DeleteDatabase(
     const string16& name,
     scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
     const string16& database_identifier,
     const base::FilePath& data_directory) {
-  IDB_TRACE("IndexedDBFactoryImpl::delete_database");
+  IDB_TRACE("IndexedDBFactory::delete_database");
   const string16 unique_identifier =
       ComputeUniqueIdentifier(name, database_identifier);
 
   IndexedDBDatabaseMap::iterator it =
       database_backend_map_.find(unique_identifier);
   if (it != database_backend_map_.end()) {
     // If there are any connections to the database, directly delete the
     // database.
     it->second->DeleteDatabase(callbacks);
     return;
   }
 
   // TODO(jsbell): Everything from now on should be done on another thread.
   scoped_refptr<IndexedDBBackingStore> backing_store =
       OpenBackingStore(database_identifier, data_directory);
   if (!backing_store) {
     callbacks->OnError(IndexedDBDatabaseError(
         WebKit::WebIDBDatabaseExceptionUnknownError,
         ASCIIToUTF16("Internal error opening backing store "
                      "for indexed_db.delete_database.")));
     return;
   }
 
-  scoped_refptr<IndexedDBDatabaseImpl> database_backend =
-      IndexedDBDatabaseImpl::Create(
-          name, backing_store.get(), this, unique_identifier);
+  scoped_refptr<IndexedDBDatabase> database_backend = IndexedDBDatabase::Create(
+      name, backing_store.get(), this, unique_identifier);
   if (!database_backend) {
     callbacks->OnError(IndexedDBDatabaseError(
         WebKit::WebIDBDatabaseExceptionUnknownError,
         ASCIIToUTF16("Internal error creating database backend for "
                      "indexed_db.delete_database.")));
     return;
   }
 
   database_backend_map_[unique_identifier] = database_backend.get();
   database_backend->DeleteDatabase(callbacks);
   database_backend_map_.erase(unique_identifier);
 }
 
-scoped_refptr<IndexedDBBackingStore> IndexedDBFactoryImpl::OpenBackingStore(
+scoped_refptr<IndexedDBBackingStore> IndexedDBFactory::OpenBackingStore(
     const string16& database_identifier,
     const base::FilePath& data_directory) {
   const string16 file_identifier = ComputeFileIdentifier(database_identifier);
   const bool open_in_memory = data_directory.empty();
 
   IndexedDBBackingStoreMap::iterator it2 =
       backing_store_map_.find(file_identifier);
   if (it2 != backing_store_map_.end() && it2->second.get())
     return it2->second.get();
 
@@ skipping 15 matching lines @@
     // All backing stores associated with this factory should be of the same
     // type.
     DCHECK(session_only_backing_stores_.empty() || open_in_memory);
 
     return backing_store;
   }
 
   return 0;
 }
 
-void IndexedDBFactoryImpl::Open(
+void IndexedDBFactory::Open(
     const string16& name,
     int64 version,
     int64 transaction_id,
     scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
     scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks,
     const string16& database_identifier,
     const base::FilePath& data_directory) {
-  IDB_TRACE("IndexedDBFactoryImpl::open");
+  IDB_TRACE("IndexedDBFactory::open");
   const string16 unique_identifier =
       ComputeUniqueIdentifier(name, database_identifier);
 
-  scoped_refptr<IndexedDBDatabaseImpl> database_backend;
+  scoped_refptr<IndexedDBDatabase> database_backend;
   IndexedDBDatabaseMap::iterator it =
       database_backend_map_.find(unique_identifier);
   if (it == database_backend_map_.end()) {
     scoped_refptr<IndexedDBBackingStore> backing_store =
         OpenBackingStore(database_identifier, data_directory);
     if (!backing_store) {
       callbacks->OnError(IndexedDBDatabaseError(
           WebKit::WebIDBDatabaseExceptionUnknownError,
           ASCIIToUTF16(
               "Internal error opening backing store for indexedDB.open.")));
       return;
     }
 
-    database_backend = IndexedDBDatabaseImpl::Create(
+    database_backend = IndexedDBDatabase::Create(
         name, backing_store.get(), this, unique_identifier);
     if (!database_backend) {
       callbacks->OnError(IndexedDBDatabaseError(
           WebKit::WebIDBDatabaseExceptionUnknownError,
           ASCIIToUTF16(
               "Internal error creating database backend for indexedDB.open.")));
       return;
     }
 
     database_backend_map_[unique_identifier] = database_backend.get();
   } else {
     database_backend = it->second;
   }
 
   database_backend->OpenConnection(
       callbacks, database_callbacks, transaction_id, version);
 }
 
 }  // namespace content