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

content/browser/indexed_db/indexed_db_context_impl.h

Index: content/browser/indexed_db/indexed_db_context_impl.h
diff --git a/content/browser/indexed_db/indexed_db_context_impl.h b/content/browser/indexed_db/indexed_db_context_impl.h
index 846b2b183483007c4794502309cd160d0f56d327..48bf53ea750007e3df54980f18522a018aea2d60 100644
--- a/content/browser/indexed_db/indexed_db_context_impl.h
+++ b/content/browser/indexed_db/indexed_db_context_impl.h
@@ -13,6 +13,7 @@
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
+#include "content/browser/indexed_db/webidbfactory_impl.h"
 #include "content/public/browser/indexed_db_context.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/common/quota/quota_types.h"
@@ -20,7 +21,6 @@
 class GURL;
 
 namespace WebKit {
-class WebIDBDatabase;
 class WebIDBFactory;
 }
 
@@ -36,6 +36,8 @@ class SpecialStoragePolicy;
 
 namespace content {
 
+class WebIDBDatabaseImpl;
+
 class CONTENT_EXPORT IndexedDBContextImpl
     : NON_EXPORTED_BASE(public IndexedDBContext) {
  public:
@@ -45,7 +47,7 @@ class CONTENT_EXPORT IndexedDBContextImpl
                        quota::QuotaManagerProxy* quota_manager_proxy,
                        base::MessageLoopProxy* webkit_thread_loop);
 
-  WebKit::WebIDBFactory* GetIDBFactory();
+  WebIDBFactoryImpl* GetIDBFactory();
 
   // The indexed db directory.
   static const base::FilePath::CharType kIndexedDBDirectory[];
@@ -66,8 +68,8 @@ class CONTENT_EXPORT IndexedDBContextImpl
       OVERRIDE;
 
   // Methods called by IndexedDBDispatcherHost for quota support.
-  void ConnectionOpened(const GURL& origin_url, WebKit::WebIDBDatabase* db);
-  void ConnectionClosed(const GURL& origin_url, WebKit::WebIDBDatabase* db);
+  void ConnectionOpened(const GURL& origin_url, WebIDBDatabaseImpl* db);
+  void ConnectionClosed(const GURL& origin_url, WebIDBDatabaseImpl* db);
   void TransactionComplete(const GURL& origin_url);
   bool WouldBeOverQuota(const GURL& origin_url, int64 additional_bytes);
   bool IsOverQuota(const GURL& origin_url);
@@ -121,7 +123,7 @@ class CONTENT_EXPORT IndexedDBContextImpl
   // Only for testing.
   void ResetCaches();
 
-  scoped_ptr<WebKit::WebIDBFactory> idb_factory_;
+  scoped_ptr<WebIDBFactoryImpl> idb_factory_;
   base::FilePath data_path_;
   // If true, nothing (not even session-only data) should be deleted on exit.
   bool force_keep_session_state_;
@@ -130,7 +132,7 @@ class CONTENT_EXPORT IndexedDBContextImpl
   scoped_ptr<std::set<GURL> > origin_set_;
   OriginToSizeMap origin_size_map_;
   OriginToSizeMap space_available_map_;
-  typedef std::set<WebKit::WebIDBDatabase*> ConnectionSet;
+  typedef std::set<WebIDBDatabaseImpl*> ConnectionSet;
   std::map<GURL, ConnectionSet> connections_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBContextImpl);