Revert 60457 - Adds IDBFactory::didCompleteEventsForTransaction plumbing

(depends on https://bugs.webkit.org/show_bug.cgi?id=44700)

TEST=IndexedDBBrowserTest.TransactionGetTest

This takes over http://codereview.chromium.org/3310022/show

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

TBR=andreip@chromium.org
Review URL: http://codereview.chromium.org/3405031

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

5 files changed, 12 insertions, 12 deletions

diff --git a/chrome/renderer/renderer_webidbfactory_impl.cc b/chrome/renderer/renderer_webidbfactory_impl.cc
index 776c6f1..f06e190 100644
--- a/chrome/renderer/renderer_webidbfactory_impl.cc
+++ b/chrome/renderer/renderer_webidbfactory_impl.cc
@@ -33,3 +33,13 @@ void RendererWebIDBFactoryImpl::open(
   dispatcher->RequestIDBFactoryOpen(
       name, description, callbacks, origin.databaseIdentifier(), web_frame);
 }
+
+void RendererWebIDBFactoryImpl::abortPendingTransactions(
+    const WebKit::WebVector<int>& pendingIDs) {
+  std::vector<int> ids;
+  for (size_t i = 0; i < pendingIDs.size(); ++i) {
+    ids.push_back(pendingIDs[i]);
+  }
+  RenderThread::current()->Send(
+      new ViewHostMsg_IDBFactoryAbortPendingTransactions(ids));
+}
diff --git a/chrome/renderer/renderer_webidbfactory_impl.h b/chrome/renderer/renderer_webidbfactory_impl.h
index de4d4ee..3953249 100644
--- a/chrome/renderer/renderer_webidbfactory_impl.h
+++ b/chrome/renderer/renderer_webidbfactory_impl.h
@@ -29,6 +29,8 @@ class RendererWebIDBFactoryImpl : public WebKit::WebIDBFactory {
       WebKit::WebIDBCallbacks* callbacks,
       const WebKit::WebSecurityOrigin& origin, WebKit::WebFrame* web_frame,
       const WebKit::WebString& dataDir);
+  virtual void abortPendingTransactions(
+      const WebKit::WebVector<int>& pendingIDs);
 };
 
 #endif  // CHROME_RENDERER_RENDERER_WEBIDBFACTORY_IMPL_H_
diff --git a/chrome/renderer/renderer_webidbobjectstore_impl.cc b/chrome/renderer/renderer_webidbobjectstore_impl.cc
index ce456dd1..28c14f4 100644
--- a/chrome/renderer/renderer_webidbobjectstore_impl.cc
+++ b/chrome/renderer/renderer_webidbobjectstore_impl.cc
@@ -14,7 +14,6 @@
 #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"
-#include "third_party/WebKit/WebKit/chromium/public/WebIDBTransaction.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSerializedScriptValue.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 
@@ -24,7 +23,6 @@ using WebKit::WebIDBCallbacks;
 using WebKit::WebIDBKeyRange;
 using WebKit::WebIDBIndex;
 using WebKit::WebIDBKey;
-using WebKit::WebIDBTransaction;
 using WebKit::WebSerializedScriptValue;
 using WebKit::WebString;
 
diff --git a/chrome/renderer/renderer_webidbtransaction_impl.cc b/chrome/renderer/renderer_webidbtransaction_impl.cc
index 3aa2387..dddb2d2 100644
--- a/chrome/renderer/renderer_webidbtransaction_impl.cc
+++ b/chrome/renderer/renderer_webidbtransaction_impl.cc
@@ -40,8 +40,6 @@ WebIDBObjectStore* RendererWebIDBTransactionImpl::objectStore(
   RenderThread::current()->Send(
       new ViewHostMsg_IDBTransactionObjectStore(
           idb_transaction_id_, name, &object_store_id));
-  if (!object_store_id)
-    return NULL;
   return new RendererWebIDBObjectStoreImpl(object_store_id);
 }
 
@@ -51,13 +49,6 @@ void RendererWebIDBTransactionImpl::abort()
       idb_transaction_id_));
 }
 
-void RendererWebIDBTransactionImpl::didCompleteTaskEvents()
-{
-  RenderThread::current()->Send(
-      new ViewHostMsg_IDBTransactionDidCompleteTaskEvents(
-          idb_transaction_id_));
-}
-
 int RendererWebIDBTransactionImpl::id() const
 {
   return idb_transaction_id_;
diff --git a/chrome/renderer/renderer_webidbtransaction_impl.h b/chrome/renderer/renderer_webidbtransaction_impl.h
index d1f74fb..4369104 100644
--- a/chrome/renderer/renderer_webidbtransaction_impl.h
+++ b/chrome/renderer/renderer_webidbtransaction_impl.h
@@ -23,7 +23,6 @@ class RendererWebIDBTransactionImpl : public WebKit::WebIDBTransaction {
   virtual int mode() const;
   virtual WebKit::WebIDBObjectStore* objectStore(const WebKit::WebString& name);
   virtual void abort();
-  virtual void didCompleteTaskEvents();
   virtual int id() const;
   virtual void setCallbacks(WebKit::WebIDBTransactionCallbacks*);