Get rid of the last couple references to "remove" functions and description within Chromium.

TEST=none
BUG=none

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

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

9 files changed, 18 insertions, 24 deletions

diff --git a/chrome/renderer/indexed_db_dispatcher.cc b/chrome/renderer/indexed_db_dispatcher.cc
index 2f509ff..83d3d16 100644
--- a/chrome/renderer/indexed_db_dispatcher.cc
+++ b/chrome/renderer/indexed_db_dispatcher.cc
@@ -97,7 +97,7 @@ void IndexedDBDispatcher::RequestIDBCursorContinue(
     pending_callbacks_.Remove(response_id);
 }
 
-void IndexedDBDispatcher::RequestIDBCursorRemove(
+void IndexedDBDispatcher::RequestIDBCursorDelete(
     WebIDBCallbacks* callbacks_ptr,
     int32 idb_cursor_id,
     WebExceptionCode* ec) {
@@ -105,14 +105,13 @@ void IndexedDBDispatcher::RequestIDBCursorRemove(
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBCursorRemove(idb_cursor_id, response_id, ec));
+      new ViewHostMsg_IDBCursorDelete(idb_cursor_id, response_id, ec));
   if (*ec)
     pending_callbacks_.Remove(response_id);
 }
 
 void IndexedDBDispatcher::RequestIDBFactoryOpen(
     const string16& name,
-    const string16& description,
     WebIDBCallbacks* callbacks_ptr,
     const string16& origin,
     WebFrame* web_frame,
@@ -130,7 +129,6 @@ void IndexedDBDispatcher::RequestIDBFactoryOpen(
   params.response_id_ = pending_callbacks_.Add(callbacks.release());
   params.origin_ = origin;
   params.name_ = name;
-  params.description_ = description;
   params.maximum_size_ = maximum_size;
   RenderThread::current()->Send(new ViewHostMsg_IDBFactoryOpen(params));
 }
@@ -268,7 +266,7 @@ void IndexedDBDispatcher::RequestIDBObjectStorePut(
     pending_callbacks_.Remove(params.response_id_);
 }
 
-void IndexedDBDispatcher::RequestIDBObjectStoreRemove(
+void IndexedDBDispatcher::RequestIDBObjectStoreDelete(
     const IndexedDBKey& key,
     WebIDBCallbacks* callbacks_ptr,
     int32 idb_object_store_id,
@@ -278,7 +276,7 @@ void IndexedDBDispatcher::RequestIDBObjectStoreRemove(
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreRemove(
+      new ViewHostMsg_IDBObjectStoreDelete(
           idb_object_store_id, response_id,
           key, TransactionId(transaction), ec));
   if (*ec)
diff --git a/chrome/renderer/indexed_db_dispatcher.h b/chrome/renderer/indexed_db_dispatcher.h
index b803163..1210551 100644
--- a/chrome/renderer/indexed_db_dispatcher.h
+++ b/chrome/renderer/indexed_db_dispatcher.h
@@ -35,7 +35,6 @@ class IndexedDBDispatcher {
 
   void RequestIDBFactoryOpen(
       const string16& name,
-      const string16& description,
       WebKit::WebIDBCallbacks* callbacks,
       const string16& origin,
       WebKit::WebFrame* web_frame,
@@ -53,7 +52,7 @@ class IndexedDBDispatcher {
       int32 idb_cursor_id,
       WebKit::WebExceptionCode* ec);
 
-  void RequestIDBCursorRemove(
+  void RequestIDBCursorDelete(
       WebKit::WebIDBCallbacks* callbacks_ptr,
       int32 idb_cursor_id,
       WebKit::WebExceptionCode* ec);
@@ -106,7 +105,7 @@ class IndexedDBDispatcher {
                                 const WebKit::WebIDBTransaction& transaction,
                                 WebKit::WebExceptionCode* ec);
 
-  void RequestIDBObjectStoreRemove(
+  void RequestIDBObjectStoreDelete(
       const IndexedDBKey& key,
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_object_store_id,
diff --git a/chrome/renderer/renderer_webidbcursor_impl.cc b/chrome/renderer/renderer_webidbcursor_impl.cc
index b23da07..97f4f06 100644
--- a/chrome/renderer/renderer_webidbcursor_impl.cc
+++ b/chrome/renderer/renderer_webidbcursor_impl.cc
@@ -74,5 +74,5 @@ void RendererWebIDBCursorImpl::remove(WebIDBCallbacks* callbacks,
                                       WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       RenderThread::current()->indexed_db_dispatcher();
-  dispatcher->RequestIDBCursorRemove(callbacks, idb_cursor_id_, &ec);
+  dispatcher->RequestIDBCursorDelete(callbacks, idb_cursor_id_, &ec);
 }
diff --git a/chrome/renderer/renderer_webidbdatabase_impl.cc b/chrome/renderer/renderer_webidbdatabase_impl.cc
index 09dec11..f2a0bf5 100644
--- a/chrome/renderer/renderer_webidbdatabase_impl.cc
+++ b/chrome/renderer/renderer_webidbdatabase_impl.cc
@@ -78,12 +78,12 @@ WebKit::WebIDBObjectStore* RendererWebIDBDatabaseImpl::createObjectStore(
   return new RendererWebIDBObjectStoreImpl(object_store);
 }
 
-void RendererWebIDBDatabaseImpl::removeObjectStore(
+void RendererWebIDBDatabaseImpl::deleteObjectStore(
     const WebString& name,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBDatabaseRemoveObjectStore(
+      new ViewHostMsg_IDBDatabaseDeleteObjectStore(
           idb_database_id_, name,
           IndexedDBDispatcher::TransactionId(transaction), &ec));
 }
diff --git a/chrome/renderer/renderer_webidbdatabase_impl.h b/chrome/renderer/renderer_webidbdatabase_impl.h
index a88fb41..dde351d 100644
--- a/chrome/renderer/renderer_webidbdatabase_impl.h
+++ b/chrome/renderer/renderer_webidbdatabase_impl.h
@@ -32,7 +32,7 @@ class RendererWebIDBDatabaseImpl : public WebKit::WebIDBDatabase {
       bool auto_increment,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode& ec);
-  virtual void removeObjectStore(
+  virtual void deleteObjectStore(
       const WebKit::WebString& name,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode& ec);
diff --git a/chrome/renderer/renderer_webidbfactory_impl.cc b/chrome/renderer/renderer_webidbfactory_impl.cc
index 9362964..e3845da 100644
--- a/chrome/renderer/renderer_webidbfactory_impl.cc
+++ b/chrome/renderer/renderer_webidbfactory_impl.cc
@@ -25,7 +25,6 @@ RendererWebIDBFactoryImpl::~RendererWebIDBFactoryImpl() {
 
 void RendererWebIDBFactoryImpl::open(
     const WebString& name,
-    const WebString& description,
     WebIDBCallbacks* callbacks,
     const WebSecurityOrigin& origin,
     WebFrame* web_frame,
@@ -35,6 +34,5 @@ void RendererWebIDBFactoryImpl::open(
   IndexedDBDispatcher* dispatcher =
       RenderThread::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBFactoryOpen(
-      name, description, callbacks, origin.databaseIdentifier(), web_frame,
-      maximum_size);
+      name, callbacks, origin.databaseIdentifier(), web_frame, maximum_size);
 }
diff --git a/chrome/renderer/renderer_webidbfactory_impl.h b/chrome/renderer/renderer_webidbfactory_impl.h
index 9b28a66..a273d8a 100644
--- a/chrome/renderer/renderer_webidbfactory_impl.h
+++ b/chrome/renderer/renderer_webidbfactory_impl.h
@@ -26,7 +26,6 @@ class RendererWebIDBFactoryImpl : public WebKit::WebIDBFactory {
   // See WebIDBFactory.h for documentation on these functions.
   virtual void open(
       const WebKit::WebString& name,
-      const WebKit::WebString& description,
       WebKit::WebIDBCallbacks* callbacks,
       const WebKit::WebSecurityOrigin& origin,
       WebKit::WebFrame* web_frame,
diff --git a/chrome/renderer/renderer_webidbobjectstore_impl.cc b/chrome/renderer/renderer_webidbobjectstore_impl.cc
index 700ef04..8b356df 100644
--- a/chrome/renderer/renderer_webidbobjectstore_impl.cc
+++ b/chrome/renderer/renderer_webidbobjectstore_impl.cc
@@ -91,14 +91,14 @@ void RendererWebIDBObjectStoreImpl::put(
       idb_object_store_id_, transaction, &ec);
 }
 
-void RendererWebIDBObjectStoreImpl::remove(
+void RendererWebIDBObjectStoreImpl::deleteFunction(
     const WebIDBKey& key,
     WebIDBCallbacks* callbacks,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       RenderThread::current()->indexed_db_dispatcher();
-  dispatcher->RequestIDBObjectStoreRemove(
+  dispatcher->RequestIDBObjectStoreDelete(
       IndexedDBKey(key), callbacks, idb_object_store_id_, transaction, &ec);
 }
 
@@ -140,7 +140,7 @@ void RendererWebIDBObjectStoreImpl::deleteIndex(
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreRemoveIndex(
+      new ViewHostMsg_IDBObjectStoreDeleteIndex(
           idb_object_store_id_, name,
           IndexedDBDispatcher::TransactionId(transaction), &ec));
 }
diff --git a/chrome/renderer/renderer_webidbobjectstore_impl.h b/chrome/renderer/renderer_webidbobjectstore_impl.h
index 147a50d..9d43a8b 100644
--- a/chrome/renderer/renderer_webidbobjectstore_impl.h
+++ b/chrome/renderer/renderer_webidbobjectstore_impl.h
@@ -39,10 +39,10 @@ class RendererWebIDBObjectStoreImpl : public WebKit::WebIDBObjectStore {
            WebKit::WebIDBCallbacks* callbacks,
            const WebKit::WebIDBTransaction& transaction,
            WebKit::WebExceptionCode& ec);
-  void remove(const WebKit::WebIDBKey& key,
-              WebKit::WebIDBCallbacks* callbacks,
-              const WebKit::WebIDBTransaction& transaction,
-              WebKit::WebExceptionCode& ec);
+  void deleteFunction(const WebKit::WebIDBKey& key,
+                      WebKit::WebIDBCallbacks* callbacks,
+                      const WebKit::WebIDBTransaction& transaction,
+                      WebKit::WebExceptionCode& ec);
 
   WebKit::WebIDBIndex* createIndex(
       const WebKit::WebString& name,