IndexedDB: remove proxy and IPC code for the IDBKey-based get/getKey.

This is purely removing code that is no longer called, since 
https://bugs.webkit.org/show_bug.cgi?id=83638 has been fixed.

BUG=124650


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

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

7 files changed, 9 insertions, 148 deletions

diff --git a/content/common/indexed_db/indexed_db_dispatcher.cc b/content/common/indexed_db/indexed_db_dispatcher.cc
index ccb123f..b725a7d 100644
--- a/content/common/indexed_db/indexed_db_dispatcher.cc
+++ b/content/common/indexed_db/indexed_db_dispatcher.cc
@@ -354,22 +354,6 @@ void IndexedDBDispatcher::RequestIDBIndexCount(
 }
 
 void IndexedDBDispatcher::RequestIDBIndexGetObject(
-    const IndexedDBKey& key,
-    WebIDBCallbacks* callbacks_ptr,
-    int32 idb_index_id,
-    const WebIDBTransaction& transaction,
-    WebExceptionCode* ec) {
-  ResetCursorPrefetchCaches();
-  scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
-  int32 response_id = pending_callbacks_.Add(callbacks.release());
-  Send(new IndexedDBHostMsg_IndexGetObject(idb_index_id, CurrentWorkerId(),
-                                           response_id, key,
-                                           TransactionId(transaction), ec));
-  if (*ec)
-    pending_callbacks_.Remove(response_id);
-}
-
-void IndexedDBDispatcher::RequestIDBIndexGetObjectByRange(
     const IndexedDBKeyRange& key_range,
     WebIDBCallbacks* callbacks_ptr,
     int32 idb_index_id,
@@ -378,7 +362,7 @@ void IndexedDBDispatcher::RequestIDBIndexGetObjectByRange(
   ResetCursorPrefetchCaches();
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
   int32 response_id = pending_callbacks_.Add(callbacks.release());
-  Send(new IndexedDBHostMsg_IndexGetObjectByRange(
+  Send(new IndexedDBHostMsg_IndexGetObject(
            idb_index_id, CurrentWorkerId(),
            response_id, key_range,
            TransactionId(transaction), ec));
@@ -387,22 +371,6 @@ void IndexedDBDispatcher::RequestIDBIndexGetObjectByRange(
 }
 
 void IndexedDBDispatcher::RequestIDBIndexGetKey(
-    const IndexedDBKey& key,
-    WebIDBCallbacks* callbacks_ptr,
-    int32 idb_index_id,
-    const WebIDBTransaction& transaction,
-    WebExceptionCode* ec) {
-  ResetCursorPrefetchCaches();
-  scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
-  int32 response_id = pending_callbacks_.Add(callbacks.release());
-  Send(new IndexedDBHostMsg_IndexGetKey(
-           idb_index_id, CurrentWorkerId(), response_id, key,
-           TransactionId(transaction), ec));
-  if (*ec)
-    pending_callbacks_.Remove(response_id);
-}
-
-void IndexedDBDispatcher::RequestIDBIndexGetKeyByRange(
     const IndexedDBKeyRange& key_range,
     WebIDBCallbacks* callbacks_ptr,
     int32 idb_index_id,
@@ -411,7 +379,7 @@ void IndexedDBDispatcher::RequestIDBIndexGetKeyByRange(
   ResetCursorPrefetchCaches();
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
   int32 response_id = pending_callbacks_.Add(callbacks.release());
-  Send(new IndexedDBHostMsg_IndexGetKeyByRange(
+  Send(new IndexedDBHostMsg_IndexGetKey(
            idb_index_id, CurrentWorkerId(), response_id, key_range,
            TransactionId(transaction), ec));
   if (*ec)
@@ -419,23 +387,6 @@ void IndexedDBDispatcher::RequestIDBIndexGetKeyByRange(
 }
 
 void IndexedDBDispatcher::RequestIDBObjectStoreGet(
-    const IndexedDBKey& key,
-    WebIDBCallbacks* callbacks_ptr,
-    int32 idb_object_store_id,
-    const WebIDBTransaction& transaction,
-    WebExceptionCode* ec) {
-  ResetCursorPrefetchCaches();
-  scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
-
-  int32 response_id = pending_callbacks_.Add(callbacks.release());
-  Send(new IndexedDBHostMsg_ObjectStoreGet(
-           idb_object_store_id, CurrentWorkerId(), response_id,
-           key, TransactionId(transaction), ec));
-  if (*ec)
-    pending_callbacks_.Remove(response_id);
-}
-
-void IndexedDBDispatcher::RequestIDBObjectStoreGetByRange(
     const IndexedDBKeyRange& key_range,
     WebIDBCallbacks* callbacks_ptr,
     int32 idb_object_store_id,
@@ -445,7 +396,7 @@ void IndexedDBDispatcher::RequestIDBObjectStoreGetByRange(
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
-  Send(new IndexedDBHostMsg_ObjectStoreGetByRange(
+  Send(new IndexedDBHostMsg_ObjectStoreGet(
            idb_object_store_id, CurrentWorkerId(), response_id,
            key_range, TransactionId(transaction), ec));
   if (*ec)
diff --git a/content/common/indexed_db/indexed_db_dispatcher.h b/content/common/indexed_db/indexed_db_dispatcher.h
index 5c6d705..bbaa19c 100644
--- a/content/common/indexed_db/indexed_db_dispatcher.h
+++ b/content/common/indexed_db/indexed_db_dispatcher.h
@@ -142,39 +142,21 @@ class CONTENT_EXPORT IndexedDBDispatcher
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode* ec);
 
-  void RequestIDBIndexGetObject(const IndexedDBKey& key,
-                                WebKit::WebIDBCallbacks* callbacks,
-                                int32 idb_index_id,
-                                const WebKit::WebIDBTransaction& transaction,
-                                 WebKit::WebExceptionCode* ec);
-
-  void RequestIDBIndexGetObjectByRange(
+  void RequestIDBIndexGetObject(
       const IndexedDBKeyRange& key_range,
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_index_id,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode* ec);
 
-  void RequestIDBIndexGetKey(const IndexedDBKey& key,
-                             WebKit::WebIDBCallbacks* callbacks,
-                             int32 idb_index_id,
-                             const WebKit::WebIDBTransaction& transaction,
-                             WebKit::WebExceptionCode* ec);
-
-  void RequestIDBIndexGetKeyByRange(
+  void RequestIDBIndexGetKey(
       const IndexedDBKeyRange& key_range,
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_index_id,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode* ec);
 
-  void RequestIDBObjectStoreGet(const IndexedDBKey& key,
-                                WebKit::WebIDBCallbacks* callbacks,
-                                int32 idb_object_store_id,
-                                const WebKit::WebIDBTransaction& transaction,
-                                WebKit::WebExceptionCode* ec);
-
-  void RequestIDBObjectStoreGetByRange(
+  void RequestIDBObjectStoreGet(
       const IndexedDBKeyRange& key_range,
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_object_store_id,
diff --git a/content/common/indexed_db/indexed_db_messages.h b/content/common/indexed_db/indexed_db_messages.h
index f24e79a..ef12c4a 100644
--- a/content/common/indexed_db/indexed_db_messages.h
+++ b/content/common/indexed_db/indexed_db_messages.h
@@ -429,15 +429,6 @@ IPC_SYNC_MESSAGE_CONTROL5_1(IndexedDBHostMsg_IndexGetObject,
                             int32, /* idb_index_id */
                             int32, /* thread_id */
                             int32, /* response_id */
-                            IndexedDBKey, /* key */
-                            int32, /* transaction_id */
-                            WebKit::WebExceptionCode /* ec */)
-
-// WebIDBIndex::getObjectByRange() message.
-IPC_SYNC_MESSAGE_CONTROL5_1(IndexedDBHostMsg_IndexGetObjectByRange,
-                            int32, /* idb_index_id */
-                            int32, /* thread_id */
-                            int32, /* response_id */
                             IndexedDBKeyRange, /* key */
                             int32, /* transaction_id */
                             WebKit::WebExceptionCode /* ec */)
@@ -447,15 +438,6 @@ IPC_SYNC_MESSAGE_CONTROL5_1(IndexedDBHostMsg_IndexGetKey,
                             int32, /* idb_index_id */
                             int32, /* thread_id */
                             int32, /* response_id */
-                            IndexedDBKey, /* key */
-                            int32, /* transaction_id */
-                            WebKit::WebExceptionCode /* ec */)
-
-// WebIDBIndex::getKeyByRange() message.
-IPC_SYNC_MESSAGE_CONTROL5_1(IndexedDBHostMsg_IndexGetKeyByRange,
-                            int32, /* idb_index_id */
-                            int32, /* thread_id */
-                            int32, /* response_id */
                             IndexedDBKeyRange, /* key */
                             int32, /* transaction_id */
                             WebKit::WebExceptionCode /* ec */)
@@ -484,15 +466,6 @@ IPC_SYNC_MESSAGE_CONTROL5_1(IndexedDBHostMsg_ObjectStoreGet,
                             int32, /* idb_object_store_id */
                             int32, /* thread_id */
                             int32, /* response_id */
-                            IndexedDBKey, /* key */
-                            int32, /* transaction_id */
-                            WebKit::WebExceptionCode /* ec */)
-
-// WebIDBObjectStore::get() message.
-IPC_SYNC_MESSAGE_CONTROL5_1(IndexedDBHostMsg_ObjectStoreGetByRange,
-                            int32, /* idb_object_store_id */
-                            int32, /* thread_id */
-                            int32, /* response_id */
                             IndexedDBKeyRange, /* key_range */
                             int32, /* transaction_id */
                             WebKit::WebExceptionCode /* ec */)
diff --git a/content/common/indexed_db/proxy_webidbindex_impl.cc b/content/common/indexed_db/proxy_webidbindex_impl.cc
index 45ca84a..4a58327 100644
--- a/content/common/indexed_db/proxy_webidbindex_impl.cc
+++ b/content/common/indexed_db/proxy_webidbindex_impl.cc
@@ -100,45 +100,23 @@ void RendererWebIDBIndexImpl::count(
 }
 
 void RendererWebIDBIndexImpl::getObject(
-    const WebKit::WebIDBKey& key,
-    WebKit::WebIDBCallbacks* callbacks,
-    const WebKit::WebIDBTransaction& transaction,
-    WebExceptionCode& ec) {
-  IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance();
-  dispatcher->RequestIDBIndexGetObject(
-      IndexedDBKey(key), callbacks, idb_index_id_, transaction, &ec);
-}
-
-void RendererWebIDBIndexImpl::getObject(
     const WebKit::WebIDBKeyRange& key_range,
     WebKit::WebIDBCallbacks* callbacks,
     const WebKit::WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance();
-  dispatcher->RequestIDBIndexGetObjectByRange(
+  dispatcher->RequestIDBIndexGetObject(
       IndexedDBKeyRange(key_range), callbacks, idb_index_id_, transaction, &ec);
 }
 
 void RendererWebIDBIndexImpl::getKey(
-    const WebKit::WebIDBKey& key,
-    WebKit::WebIDBCallbacks* callbacks,
-    const WebKit::WebIDBTransaction& transaction,
-    WebExceptionCode& ec) {
-  IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance();
-  dispatcher->RequestIDBIndexGetKey(
-      IndexedDBKey(key), callbacks, idb_index_id_, transaction, &ec);
-}
-
-void RendererWebIDBIndexImpl::getKey(
     const WebKit::WebIDBKeyRange& key_range,
     WebKit::WebIDBCallbacks* callbacks,
     const WebKit::WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance();
-  dispatcher->RequestIDBIndexGetKeyByRange(
+  dispatcher->RequestIDBIndexGetKey(
       IndexedDBKeyRange(key_range), callbacks, idb_index_id_, transaction, &ec);
 }
diff --git a/content/common/indexed_db/proxy_webidbindex_impl.h b/content/common/indexed_db/proxy_webidbindex_impl.h
index 112eda0..0b806f0 100644
--- a/content/common/indexed_db/proxy_webidbindex_impl.h
+++ b/content/common/indexed_db/proxy_webidbindex_impl.h
@@ -36,18 +36,10 @@ class RendererWebIDBIndexImpl : public WebKit::WebIDBIndex {
                      WebKit::WebIDBCallbacks* callbacks,
                      const WebKit::WebIDBTransaction& transaction,
                      WebKit::WebExceptionCode& ec);
-  virtual void getObject(const WebKit::WebIDBKey& key,
-                         WebKit::WebIDBCallbacks* callbacks,
-                         const WebKit::WebIDBTransaction& transaction,
-                         WebKit::WebExceptionCode& ec);
   virtual void getObject(const WebKit::WebIDBKeyRange& key_range,
                          WebKit::WebIDBCallbacks* callbacks,
                          const WebKit::WebIDBTransaction& transaction,
                          WebKit::WebExceptionCode& ec);
-  virtual void getKey(const WebKit::WebIDBKey& key,
-                      WebKit::WebIDBCallbacks* callbacks,
-                      const WebKit::WebIDBTransaction& transaction,
-                      WebKit::WebExceptionCode& ec);
   virtual void getKey(const WebKit::WebIDBKeyRange& key_range,
                       WebKit::WebIDBCallbacks* callbacks,
                       const WebKit::WebIDBTransaction& transaction,
diff --git a/content/common/indexed_db/proxy_webidbobjectstore_impl.cc b/content/common/indexed_db/proxy_webidbobjectstore_impl.cc
index e417103..70e687e 100644
--- a/content/common/indexed_db/proxy_webidbobjectstore_impl.cc
+++ b/content/common/indexed_db/proxy_webidbobjectstore_impl.cc
@@ -70,24 +70,13 @@ WebDOMStringList RendererWebIDBObjectStoreImpl::indexNames() const {
 }
 
 void RendererWebIDBObjectStoreImpl::get(
-    const WebIDBKey& key,
-    WebIDBCallbacks* callbacks,
-    const WebIDBTransaction& transaction,
-    WebExceptionCode& ec) {
-  IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance();
-  dispatcher->RequestIDBObjectStoreGet(
-      IndexedDBKey(key), callbacks, idb_object_store_id_, transaction, &ec);
-}
-
-void RendererWebIDBObjectStoreImpl::get(
     const WebIDBKeyRange& key_range,
     WebIDBCallbacks* callbacks,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance();
-  dispatcher->RequestIDBObjectStoreGetByRange(
+  dispatcher->RequestIDBObjectStoreGet(
       IndexedDBKeyRange(key_range), callbacks,
       idb_object_store_id_, transaction, &ec);
 }
diff --git a/content/common/indexed_db/proxy_webidbobjectstore_impl.h b/content/common/indexed_db/proxy_webidbobjectstore_impl.h
index bd96038..80ca003 100644
--- a/content/common/indexed_db/proxy_webidbobjectstore_impl.h
+++ b/content/common/indexed_db/proxy_webidbobjectstore_impl.h
@@ -28,10 +28,6 @@ class RendererWebIDBObjectStoreImpl : public WebKit::WebIDBObjectStore {
   virtual WebKit::WebString keyPathString() const;
   virtual WebKit::WebDOMStringList indexNames() const;
 
-  virtual void get(const WebKit::WebIDBKey& key,
-                   WebKit::WebIDBCallbacks* callbacks,
-                   const WebKit::WebIDBTransaction& transaction,
-                   WebKit::WebExceptionCode& ec);
   virtual void get(const WebKit::WebIDBKeyRange& key_range,
                    WebKit::WebIDBCallbacks* callbacks,
                    const WebKit::WebIDBTransaction& transaction,