Revert 60275.

TEST=none
BUG=none

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

1 files changed, 14 insertions, 32 deletions

diff --git a/chrome/renderer/renderer_webidbobjectstore_impl.cc b/chrome/renderer/renderer_webidbobjectstore_impl.cc
index ead8e53..d29a326 100644
--- a/chrome/renderer/renderer_webidbobjectstore_impl.cc
+++ b/chrome/renderer/renderer_webidbobjectstore_impl.cc
@@ -10,7 +10,6 @@
 #include "chrome/renderer/indexed_db_dispatcher.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/renderer_webidbindex_impl.h"
-#include "chrome/renderer/renderer_webidbtransaction_impl.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDOMStringList.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBKey.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBKeyRange.h"
@@ -62,43 +61,30 @@ WebDOMStringList RendererWebIDBObjectStoreImpl::indexNames() const {
   return web_result;
 }
 
-void RendererWebIDBObjectStoreImpl::get(
-    const WebIDBKey& key,
-    WebIDBCallbacks* callbacks,
-    const WebKit::WebIDBTransaction& transaction) {
+void RendererWebIDBObjectStoreImpl::get(const WebIDBKey& key,
+                                        WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
       RenderThread::current()->indexed_db_dispatcher();
-  int transaction_id =
-      static_cast<const RendererWebIDBTransactionImpl*>(&transaction)->id();
-  dispatcher->RequestIDBObjectStoreGet(
-      IndexedDBKey(key), callbacks, idb_object_store_id_, transaction_id);
+  dispatcher->RequestIDBObjectStoreGet(IndexedDBKey(key),
+                                       callbacks, idb_object_store_id_);
 }
 
 void RendererWebIDBObjectStoreImpl::put(
-    const WebSerializedScriptValue& value,
-    const WebIDBKey& key,
-    bool add_only,
-    WebIDBCallbacks* callbacks,
-    const WebKit::WebIDBTransaction& transaction) {
+    const WebSerializedScriptValue& value, const WebIDBKey& key, bool add_only,
+    WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
       RenderThread::current()->indexed_db_dispatcher();
-  int transaction_id =
-      static_cast<const RendererWebIDBTransactionImpl*>(&transaction)->id();
   dispatcher->RequestIDBObjectStorePut(
       SerializedScriptValue(value), IndexedDBKey(key), add_only, callbacks,
-      idb_object_store_id_, transaction_id);
+      idb_object_store_id_);
 }
 
-void RendererWebIDBObjectStoreImpl::remove(
-    const WebIDBKey& key,
-    WebIDBCallbacks* callbacks,
-    const WebKit::WebIDBTransaction& transaction) {
+void RendererWebIDBObjectStoreImpl::remove(const WebIDBKey& key,
+                                           WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
       RenderThread::current()->indexed_db_dispatcher();
-  int transaction_id =
-      static_cast<const RendererWebIDBTransactionImpl*>(&transaction)->id();
-  dispatcher->RequestIDBObjectStoreRemove(
-      IndexedDBKey(key), callbacks, idb_object_store_id_, transaction_id);
+  dispatcher->RequestIDBObjectStoreRemove(IndexedDBKey(key), callbacks,
+                                          idb_object_store_id_);
 }
 
 void RendererWebIDBObjectStoreImpl::createIndex(
@@ -132,13 +118,9 @@ void RendererWebIDBObjectStoreImpl::removeIndex(const WebString& name,
 
 void RendererWebIDBObjectStoreImpl::openCursor(
     const WebIDBKeyRange& idb_key_range,
-    unsigned short direction, WebIDBCallbacks* callbacks,
-    const WebKit::WebIDBTransaction& transaction) {
+    unsigned short direction, WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
       RenderThread::current()->indexed_db_dispatcher();
-  int transaction_id =
-      static_cast<const RendererWebIDBTransactionImpl*>(&transaction)->id();
-  dispatcher->RequestIDBObjectStoreOpenCursor(
-      idb_key_range, direction, callbacks,  idb_object_store_id_,
-      transaction_id);
+  dispatcher->RequestIDBObjectStoreOpenCursor(idb_key_range, direction,
+                                              callbacks,  idb_object_store_id_);
 }