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

content/browser/indexed_db/indexed_db_context_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CONTEXT_IMPL_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CONTEXT_IMPL_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #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"
 
 class GURL;
 
-namespace WebKit {
-class WebIDBDatabase;
-class WebIDBFactory;
-}
-
 namespace base {
 class FilePath;
 class MessageLoopProxy;
 }
 
 namespace quota {
 class QuotaManagerProxy;
 class SpecialStoragePolicy;
 }
 
 namespace content {
 
+class WebIDBDatabaseImpl;
+
 class CONTENT_EXPORT IndexedDBContextImpl
     : NON_EXPORTED_BASE(public IndexedDBContext) {
  public:
   // If |data_path| is empty, nothing will be saved to disk.
   IndexedDBContextImpl(const base::FilePath& data_path,
                        quota::SpecialStoragePolicy* special_storage_policy,
                        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[];
 
   // The indexed db file extension.
   static const base::FilePath::CharType kIndexedDBExtension[];
 
   // Disables the exit-time deletion of session-only data.
   void SetForceKeepSessionState() { force_keep_session_state_ = true; }
 
   // IndexedDBContext implementation:
   virtual std::vector<GURL> GetAllOrigins() OVERRIDE;
   virtual std::vector<IndexedDBInfo> GetAllOriginsInfo() OVERRIDE;
   virtual int64 GetOriginDiskUsage(const GURL& origin_url) OVERRIDE;
   virtual base::Time GetOriginLastModified(const GURL& origin_url) OVERRIDE;
   virtual void DeleteForOrigin(const GURL& origin_url) OVERRIDE;
   virtual base::FilePath GetFilePathForTesting(const string16& origin_id) const
       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);
 
   quota::QuotaManagerProxy* quota_manager_proxy();
 
   void ForceClose(const GURL& origin_url);
   base::FilePath GetFilePath(const GURL& origin_url);
   base::FilePath data_path() const { return data_path_; }
   bool IsInOriginSet(const GURL& origin_url) {
@@ skipping 33 matching lines @@
   std::set<GURL>* GetOriginSet();
   bool AddToOriginSet(const GURL& origin_url) {
     return GetOriginSet()->insert(origin_url).second;
   }
   void RemoveFromOriginSet(const GURL& origin_url) {
     GetOriginSet()->erase(origin_url);
   }
   // 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_;
   scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
   scoped_refptr<quota::QuotaManagerProxy> quota_manager_proxy_;
   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);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CONTEXT_IMPL_H_