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

content/browser/in_process_webkit/indexed_db_dispatcher_host.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_IN_PROCESS_WEBKIT_INDEXED_DB_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_DISPATCHER_HOST_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 10 matching lines @@
 struct IndexedDBHostMsg_DatabaseDeleteRange_Params;
 struct IndexedDBHostMsg_DatabaseGet_Params;
 struct IndexedDBHostMsg_DatabaseOpenCursor_Params;
 struct IndexedDBHostMsg_DatabasePut_Params;
 struct IndexedDBHostMsg_DatabaseSetIndexKeys_Params;
 struct IndexedDBHostMsg_FactoryDeleteDatabase_Params;
 struct IndexedDBHostMsg_FactoryGetDatabaseNames_Params;
 struct IndexedDBHostMsg_FactoryOpen_Params;
 
 namespace WebKit {
-class WebIDBCursor;
-class WebIDBDatabase;
 struct WebIDBMetadata;
 }
 
 namespace content {
 class IndexedDBContextImpl;
 class IndexedDBKey;
 class IndexedDBKeyPath;
 class IndexedDBKeyRange;
+class WebIDBCursorImpl;
+class WebIDBDatabaseImpl;
 
 // Handles all IndexedDB related messages from a particular renderer process.
 class IndexedDBDispatcherHost : public BrowserMessageFilter {
  public:
   // Only call the constructor from the UI thread.
   IndexedDBDispatcherHost(int ipc_process_id,
                           IndexedDBContextImpl* indexed_db_context);
 
   static IndexedDBDatabaseMetadata ConvertMetadata(
       const WebKit::WebIDBMetadata& metadata);
 
   // BrowserMessageFilter implementation.
   virtual void OnChannelClosing() OVERRIDE;
   virtual void OverrideThreadForMessage(const IPC::Message& message,
                                         BrowserThread::ID* thread) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok) OVERRIDE;
 
   void FinishTransaction(int64 host_transaction_id, bool committed);
 
   // A shortcut for accessing our context.
   IndexedDBContextImpl* Context() { return indexed_db_context_.get(); }
 
   // The various IndexedDBCallbacks children call these methods to add the
   // results into the applicable map.  See below for more details.
-  int32 Add(WebKit::WebIDBCursor* idb_cursor);
-  int32 Add(WebKit::WebIDBDatabase* idb_database,
+  int32 Add(WebIDBCursorImpl* idb_cursor);
+  int32 Add(WebIDBDatabaseImpl* idb_database,
             int32 ipc_thread_id,
             const GURL& origin_url);
 
   void RegisterTransactionId(int64 host_transaction_id, const GURL& origin_url);
 
-  WebKit::WebIDBCursor* GetCursorFromId(int32 ipc_cursor_id);
+  WebIDBCursorImpl* GetCursorFromId(int32 ipc_cursor_id);
 
   int64 HostTransactionId(int64 transaction_id);
   int64 RendererTransactionId(int64 host_transaction_id);
 
  private:
   virtual ~IndexedDBDispatcherHost();
 
   // Message processing. Most of the work is delegated to the dispatcher hosts
   // below.
   void OnIDBFactoryGetDatabaseNames(
@@ skipping 63 matching lines @@
     void OnCreateIndex(
         const IndexedDBHostMsg_DatabaseCreateIndex_Params& params);
     void OnDeleteIndex(int32 ipc_database_id,
                        int64 transaction_id,
                        int64 object_store_id,
                        int64 index_id);
 
     void OnAbort(int32 ipc_database_id, int64 transaction_id);
     void OnCommit(int32 ipc_database_id, int64 transaction_id);
     IndexedDBDispatcherHost* parent_;
-    IDMap<WebKit::WebIDBDatabase, IDMapOwnPointer> map_;
+    IDMap<WebIDBDatabaseImpl, IDMapOwnPointer> map_;
     WebIDBObjectIDToURLMap database_url_map_;
     TransactionIDToSizeMap transaction_size_map_;
     TransactionIDToURLMap transaction_url_map_;
     TransactionIDToDatabaseIDMap transaction_database_map_;
   };
 
   class CursorDispatcherHost {
    public:
     explicit CursorDispatcherHost(IndexedDBDispatcherHost* parent);
     ~CursorDispatcherHost();
@@ skipping 12 matching lines @@
     void OnPrefetch(int32 ipc_cursor_id,
                     int32 ipc_thread_id,
                     int32 ipc_callbacks_id,
                     int n);
     void OnPrefetchReset(int32 ipc_cursor_id,
                          int used_prefetches,
                          int unused_prefetches);
     void OnDestroyed(int32 ipc_cursor_id);
 
     IndexedDBDispatcherHost* parent_;
-    IDMap<WebKit::WebIDBCursor, IDMapOwnPointer> map_;
+    IDMap<WebIDBCursorImpl, IDMapOwnPointer> map_;
   };
 
   scoped_refptr<IndexedDBContextImpl> indexed_db_context_;
 
   // Only access on WebKit thread.
   scoped_ptr<DatabaseDispatcherHost> database_dispatcher_host_;
   scoped_ptr<CursorDispatcherHost> cursor_dispatcher_host_;
 
   // Used to dispatch messages to the correct view host.
   int ipc_process_id_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_DISPATCHER_HOST_H_