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

content/browser/indexed_db/indexed_db_database_unittest.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/indexed_db/indexed_db_database.h"
 
 #include <gtest/gtest.h>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/indexed_db/indexed_db.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
 #include "content/browser/indexed_db/indexed_db_callbacks_wrapper.h"
 #include "content/browser/indexed_db/indexed_db_cursor.h"
-#include "content/browser/indexed_db/indexed_db_database_impl.h"
-#include "content/browser/indexed_db/indexed_db_factory_impl.h"
+#include "content/browser/indexed_db/indexed_db_database.h"
+#include "content/browser/indexed_db/indexed_db_factory.h"
 #include "content/browser/indexed_db/indexed_db_fake_backing_store.h"
 #include "content/browser/indexed_db/indexed_db_transaction.h"
 #include "content/browser/indexed_db/webidbdatabase_impl.h"
 
 using WebKit::WebIDBDatabase;
 using WebKit::WebIDBDatabaseError;
 using WebKit::WebIDBDatabaseCallbacks;
 
 namespace content {
 
 TEST(IndexedDBDatabaseTest, BackingStoreRetention) {
   scoped_refptr<IndexedDBFakeBackingStore> backing_store =
       new IndexedDBFakeBackingStore();
   EXPECT_TRUE(backing_store->HasOneRef());
 
-  IndexedDBFactoryImpl* factory = 0;
-  scoped_refptr<IndexedDBDatabaseImpl> db =
-      IndexedDBDatabaseImpl::Create(ASCIIToUTF16("db"),
+  IndexedDBFactory* factory = 0;
+  scoped_refptr<IndexedDBDatabase> db =
+      IndexedDBDatabase::Create(ASCIIToUTF16("db"),
                                     backing_store.get(),
                                     factory,
                                     ASCIIToUTF16("uniqueid"));
   EXPECT_FALSE(backing_store->HasOneRef());  // local and db
   db = NULL;
   EXPECT_TRUE(backing_store->HasOneRef());  // local
 }
 
 class MockIDBCallbacks : public IndexedDBCallbacksWrapper {
  public:
@@ skipping 47 matching lines @@
   friend class base::RefCounted<FakeIDBDatabaseCallbacks>;
   virtual ~FakeIDBDatabaseCallbacks() {}
   FakeIDBDatabaseCallbacks() : IndexedDBDatabaseCallbacksWrapper(NULL) {}
 };
 
 TEST(IndexedDBDatabaseTest, ConnectionLifecycle) {
   scoped_refptr<IndexedDBFakeBackingStore> backing_store =
       new IndexedDBFakeBackingStore();
   EXPECT_TRUE(backing_store->HasOneRef());  // local
 
-  IndexedDBFactoryImpl* factory = 0;
-  scoped_refptr<IndexedDBDatabaseImpl> db =
-      IndexedDBDatabaseImpl::Create(ASCIIToUTF16("db"),
+  IndexedDBFactory* factory = 0;
+  scoped_refptr<IndexedDBDatabase> db =
+      IndexedDBDatabase::Create(ASCIIToUTF16("db"),
                                     backing_store.get(),
                                     factory,
                                     ASCIIToUTF16("uniqueid"));
 
   EXPECT_FALSE(backing_store->HasOneRef());  // local and db
 
   scoped_refptr<MockIDBCallbacks> request1 = MockIDBCallbacks::Create();
   scoped_refptr<FakeIDBDatabaseCallbacks> connection1 =
       FakeIDBDatabaseCallbacks::Create();
   const int64 transaction_id1 = 1;
@@ skipping 67 matching lines @@
 
  private:
   scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks_;
 };
 
 TEST(IndexedDBDatabaseTest, ForcedClose) {
   scoped_refptr<IndexedDBFakeBackingStore> backing_store =
       new IndexedDBFakeBackingStore();
   EXPECT_TRUE(backing_store->HasOneRef());
 
-  IndexedDBFactoryImpl* factory = 0;
-  scoped_refptr<IndexedDBDatabaseImpl> backend =
-      IndexedDBDatabaseImpl::Create(ASCIIToUTF16("db"),
+  IndexedDBFactory* factory = 0;
+  scoped_refptr<IndexedDBDatabase> backend =
+      IndexedDBDatabase::Create(ASCIIToUTF16("db"),
                                     backing_store.get(),
                                     factory,
                                     ASCIIToUTF16("uniqueid"));
 
   EXPECT_FALSE(backing_store->HasOneRef());  // local and db
 
   scoped_refptr<MockIDBDatabaseCallbacks> connection =
       MockIDBDatabaseCallbacks::Create();
   scoped_refptr<IndexedDBDatabaseCallbacksWrapper> connection_proxy =
       IndexedDBDatabaseCallbacksWrapper::Create(
@@ skipping 11 matching lines @@
   const std::vector<int64> scope;
   web_database.createTransaction(
       transaction_id, 0, scope, indexed_db::TRANSACTION_READ_ONLY);
 
   web_database.forceClose();
 
   EXPECT_TRUE(backing_store->HasOneRef());  // local
 }
 
 }  // namespace content