Revert my revert of 60275 + don't do static casting + disable the tests for now.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/3435022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60283 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 16 insertions, 6 deletions

diff --git a/chrome/renderer/renderer_webidbobjectstore_impl.h b/chrome/renderer/renderer_webidbobjectstore_impl.h
index 88e5ad4..1cca553 100644
--- a/chrome/renderer/renderer_webidbobjectstore_impl.h
+++ b/chrome/renderer/renderer_webidbobjectstore_impl.h
@@ -29,21 +29,31 @@ class RendererWebIDBObjectStoreImpl : public WebKit::WebIDBObjectStore {
   WebKit::WebString keyPath() const;
   WebKit::WebDOMStringList indexNames() const;
 
-  void get(const WebKit::WebIDBKey& key, WebKit::WebIDBCallbacks* callbacks);
+  void get(const WebKit::WebIDBKey& key,
+           WebKit::WebIDBCallbacks* callbacks,
+           const WebKit::WebIDBTransaction& transaction);
   void put(const WebKit::WebSerializedScriptValue& value,
-           const WebKit::WebIDBKey& key, bool add_only,
-           WebKit::WebIDBCallbacks* callbacks);
-  void remove(const WebKit::WebIDBKey& key, WebKit::WebIDBCallbacks* callbacks);
+           const WebKit::WebIDBKey& key,
+           bool add_only,
+           WebKit::WebIDBCallbacks* callbacks,
+           const WebKit::WebIDBTransaction& transaction);
+  void remove(const WebKit::WebIDBKey& key,
+              WebKit::WebIDBCallbacks* callbacks,
+              const WebKit::WebIDBTransaction& transaction);
 
   void createIndex(const WebKit::WebString& name,
-                   const WebKit::WebString& key_path, bool unique,
+                   const WebKit::WebString& key_path,
+                   bool unique,
                    WebKit::WebIDBCallbacks* callbacks);
   // Transfers ownership of the WebIDBIndex to the caller.
   WebKit::WebIDBIndex* index(const WebKit::WebString& name);
   void removeIndex(const WebKit::WebString& name,
                    WebKit::WebIDBCallbacks* callbacks);
+
   void openCursor(const WebKit::WebIDBKeyRange& idb_key_range,
-                  unsigned short direction, WebKit::WebIDBCallbacks* callbacks);
+                  unsigned short direction,
+                  WebKit::WebIDBCallbacks* callbacks,
+                  const WebKit::WebIDBTransaction& transaction);
  private:
   int32 idb_object_store_id_;
 };