Convert WebIDBDatabaseImpl to IndexedDBConnection

content/browser/indexed_db/indexed_db_unittest.cc

 // Copyright (c) 2012 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 "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread.h"
 #include "content/browser/browser_thread_impl.h"
+#include "content/browser/indexed_db/indexed_db_connection.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
-#include "content/browser/indexed_db/webidbdatabase_impl.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/test_browser_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/quota/mock_special_storage_policy.h"
 #include "webkit/browser/quota/quota_manager.h"
 #include "webkit/browser/quota/special_storage_policy.h"
 #include "webkit/common/database/database_identifier.h"
 
 namespace content {
 
 class IndexedDBTest : public testing::Test {
  public:
   const GURL kNormalOrigin;
   const GURL kSessionOnlyOrigin;
 
   IndexedDBTest()
       : kNormalOrigin("http://normal/"),
         kSessionOnlyOrigin("http://session-only/"),
         message_loop_(base::MessageLoop::TYPE_IO),
         task_runner_(new base::TestSimpleTaskRunner),
         special_storage_policy_(new quota::MockSpecialStoragePolicy),
         file_thread_(BrowserThread::FILE_USER_BLOCKING, &message_loop_),
         io_thread_(BrowserThread::IO, &message_loop_) {
     special_storage_policy_->AddSessionOnly(kSessionOnlyOrigin);
   }
 
  protected:
-  void FlushIndexedDBTaskRunner() {
-    task_runner_->RunUntilIdle();
-  }
+  void FlushIndexedDBTaskRunner() { task_runner_->RunUntilIdle(); }
 
   base::MessageLoop message_loop_;
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy_;
 
  private:
   BrowserThreadImpl file_thread_;
   BrowserThreadImpl io_thread_;
 };
 
@@ skipping 60 matching lines @@
   }
 
   // Make sure we wait until the destructor has run.
   message_loop_.RunUntilIdle();
 
   // No data was cleared because of SetForceKeepSessionState.
   EXPECT_TRUE(file_util::DirectoryExists(normal_path));
   EXPECT_TRUE(file_util::DirectoryExists(session_only_path));
 }
 
-class MockWebIDBDatabase : public WebIDBDatabaseImpl {
+class MockConnection : public IndexedDBConnection {
  public:
-  explicit MockWebIDBDatabase(bool expect_force_close)
-      : WebIDBDatabaseImpl(NULL, NULL),
+  explicit MockConnection(bool expect_force_close)
+      : IndexedDBConnection(NULL, NULL),
         expect_force_close_(expect_force_close),
         force_close_called_(false) {}
 
-  virtual ~MockWebIDBDatabase() {
+  virtual ~MockConnection() {
     EXPECT_TRUE(force_close_called_ == expect_force_close_);
   }
 
-  virtual void forceClose() OVERRIDE {
+  virtual void ForceClose() OVERRIDE {
     ASSERT_TRUE(expect_force_close_);
     force_close_called_ = true;
   }
 
  private:
   bool expect_force_close_;
   bool force_close_called_;
 };
 
 TEST_F(IndexedDBTest, ForceCloseOpenDatabasesOnDelete) {
@@ skipping 13 matching lines @@
                                  special_storage_policy_.get(),
                                  NULL,
                                  task_runner_.get());
 
     test_path = idb_context->GetFilePathForTesting(
         webkit_database::GetIdentifierFromOrigin(kTestOrigin));
     ASSERT_TRUE(file_util::CreateDirectory(test_path));
 
     const bool kExpectForceClose = true;
 
-    MockWebIDBDatabase connection1(kExpectForceClose);
+    MockConnection connection1(kExpectForceClose);
     idb_context->TaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(&IndexedDBContextImpl::ConnectionOpened,
                    idb_context,
                    kTestOrigin,
                    &connection1));
 
-    MockWebIDBDatabase connection2(!kExpectForceClose);
+    MockConnection connection2(!kExpectForceClose);
     idb_context->TaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(&IndexedDBContextImpl::ConnectionOpened,
                    idb_context,
                    kTestOrigin,
                    &connection2));
     idb_context->TaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(&IndexedDBContextImpl::ConnectionClosed,
                    idb_context,
                    kTestOrigin,
                    &connection2));
 
     idb_context->TaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(&IndexedDBContextImpl::DeleteForOrigin,
                    idb_context,
                    kTestOrigin));
     FlushIndexedDBTaskRunner();
     message_loop_.RunUntilIdle();
   }
 
   // Make sure we wait until the destructor has run.
   message_loop_.RunUntilIdle();
 
   EXPECT_FALSE(file_util::DirectoryExists(test_path));
 }
 
 }  // namespace content