IndexedDB: Eliminate WebIDBCursor wrapper

content/browser/indexed_db/indexed_db_callbacks.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_CALLBACKS_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CALLBACKS_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/indexed_db/indexed_db_dispatcher_host.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/public/platform/WebIDBCallbacks.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabase.h"
 
 namespace content {
+class IndexedDBCursor;
 class IndexedDBDatabaseError;
-class WebIDBCursorImpl;
 class WebIDBDatabaseImpl;
 struct IndexedDBDatabaseMetadata;
 
 class IndexedDBCallbacksBase {
  public:
   virtual ~IndexedDBCallbacksBase();
 
   virtual void onError(const IndexedDBDatabaseError& error);
   virtual void onBlocked(long long old_version);
 
   // implemented by subclasses, but need to be called later
   virtual void onSuccess(const std::vector<string16>& value);
   virtual void onSuccess(WebIDBDatabaseImpl* idb_object,
                          const IndexedDBDatabaseMetadata& metadata);
   virtual void onUpgradeNeeded(long long old_version,
                                WebIDBDatabaseImpl* database,
                                const IndexedDBDatabaseMetadata&,
                                WebKit::WebIDBCallbacks::DataLoss data_loss);
-  virtual void onSuccess(WebIDBCursorImpl* idb_object,
+  virtual void onSuccess(IndexedDBCursor* idb_object,
                          const IndexedDBKey& key,
                          const IndexedDBKey& primaryKey,
                          std::vector<char>* value);
   virtual void onSuccess(const IndexedDBKey& key,
                          const IndexedDBKey& primaryKey,
                          std::vector<char>* value);
   virtual void onSuccess(std::vector<char>* value);
   virtual void onSuccessWithPrefetch(
       const std::vector<IndexedDBKey>& keys,
       const std::vector<IndexedDBKey>& primaryKeys,
@@ skipping 48 matching lines @@
       OVERRIDE;
 
  private:
   int64 host_transaction_id_;
   GURL origin_url_;
   int32 ipc_database_id_;
   int32 ipc_database_callbacks_id_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBCallbacksDatabase);
 };
 
-// WebIDBCursorImpl uses:
-// * onSuccess(WebIDBCursorImpl*, WebIDBKey, WebIDBKey, WebData)
+// IndexedDBCursor uses:
+// * onSuccess(IndexedDBCursor*, WebIDBKey, WebIDBKey, WebData)
 //   when an openCursor()/openKeyCursor() call has succeeded,
 // * onSuccess(WebIDBKey, WebIDBKey, WebData)
 //   when an advance()/continue() call has succeeded, or
 // * onSuccess()
 //   to indicate it does not contain any data, i.e., there is no key within
 //   the key range, or it has reached the end.
 template <>
-class IndexedDBCallbacks<WebIDBCursorImpl> : public IndexedDBCallbacksBase {
+class IndexedDBCallbacks<IndexedDBCursor> : public IndexedDBCallbacksBase {
  public:
   IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host,
                      int32 ipc_thread_id,
                      int32 ipc_callbacks_id,
                      int32 ipc_cursor_id)
       : IndexedDBCallbacksBase(dispatcher_host,
                                ipc_thread_id,
                                ipc_callbacks_id),
         ipc_cursor_id_(ipc_cursor_id) {}
 
-  virtual void onSuccess(WebIDBCursorImpl* idb_object,
+  virtual void onSuccess(IndexedDBCursor* idb_object,
                          const IndexedDBKey& key,
                          const IndexedDBKey& primaryKey,
                          std::vector<char>* value);
   virtual void onSuccess(const IndexedDBKey& key,
                          const IndexedDBKey& primaryKey,
                          std::vector<char>* value);
   virtual void onSuccess(std::vector<char>* value);
   virtual void onSuccessWithPrefetch(
       const std::vector<IndexedDBKey>& keys,
       const std::vector<IndexedDBKey>& primaryKeys,
@@ skipping 64 matching lines @@
   virtual void onSuccess();
   virtual void onSuccess(const IndexedDBKey& value);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBCallbacks);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CALLBACKS_H_