Remove content/browser dependency on WebKit::WebIDBCallbacks and WebKit::WebIDBDatabaseCallbacks

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/in_process_webkit/indexed_db_database_callbacks.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.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());
 
   IndexedDBFactory* factory = 0;
   scoped_refptr<IndexedDBDatabase> db =
@@ skipping 120 matching lines @@
   }
   virtual void OnComplete(int64 transaction_id) OVERRIDE {}
 
  private:
   MockIDBDatabaseCallbacks()
       : IndexedDBDatabaseCallbacksWrapper(NULL), was_abort_called_(false) {}
   virtual ~MockIDBDatabaseCallbacks() { EXPECT_TRUE(was_abort_called_); }
   bool was_abort_called_;
 };
 
-class WebIDBDatabaseCallbacksImpl : public WebIDBDatabaseCallbacks {
- public:
-  explicit WebIDBDatabaseCallbacksImpl(
-      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks)
-      : callbacks_(callbacks) {}
-  virtual ~WebIDBDatabaseCallbacksImpl() {}
-
-  virtual void onForcedClose() { callbacks_->OnForcedClose(); }
-  virtual void onVersionChange(long long old_version, long long new_version) {
-    callbacks_->OnVersionChange(old_version, new_version);
-  }
-  virtual void onAbort(long long transaction_id,
-                       const WebIDBDatabaseError& error) {
-    callbacks_->OnAbort(transaction_id, IndexedDBDatabaseError(error));
-  }
-  virtual void onComplete(long long transaction_id) {
-    callbacks_->OnComplete(transaction_id);
-  }
-
- private:
-  scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks_;
-};
-
 TEST(IndexedDBDatabaseTest, ForcedClose) {
   scoped_refptr<IndexedDBFakeBackingStore> backing_store =
       new IndexedDBFakeBackingStore();
   EXPECT_TRUE(backing_store->HasOneRef());
 
   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(
-          new WebIDBDatabaseCallbacksImpl(connection));
-  WebIDBDatabaseImpl web_database(backend, connection_proxy);
+  WebIDBDatabaseImpl web_database(backend, connection);
 
   scoped_refptr<MockIDBCallbacks> request = MockIDBCallbacks::Create();
   const int64 upgrade_transaction_id = 3;
   backend->OpenConnection(request,
-                          connection_proxy,
+                          connection,
                           upgrade_transaction_id,
                           IndexedDBDatabaseMetadata::DEFAULT_INT_VERSION);
 
   const int64 transaction_id = 123;
   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