IndexedDB: Remove IPC plumbing for obsolete property accessors.

Now that webkit.org/b/88467 has landed the IDB front end can directly respond 
to property requests (name, version, flags, etc) from script, so the IPC
plumbing to route these requests to the back end can be removed.

R=michaeln@chromium.org,dgrogan@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10657011

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

9 files changed, 0 insertions, 269 deletions

diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
index 12d9d16..8c217e0 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
@@ -327,10 +327,6 @@ bool IndexedDBDispatcherHost::DatabaseDispatcherHost::OnMessageReceived(
   IPC_BEGIN_MESSAGE_MAP_EX(IndexedDBDispatcherHost::DatabaseDispatcherHost,
                            message, *msg_is_ok)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseMetadata, OnMetadata)
-    IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseName, OnName)
-    IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseVersion, OnVersion)
-    IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseObjectStoreNames,
-                        OnObjectStoreNames)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseCreateObjectStore,
                         OnCreateObjectStore)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseDeleteObjectStore,
@@ -383,30 +379,6 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnMetadata(
   }
 }
 
-void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnName(
-    int32 object_id, string16* name) {
-  parent_->SyncGetter<string16>(&map_, object_id, name, &WebIDBDatabase::name);
-}
-
-void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnVersion(
-    int32 object_id, string16* version) {
-  parent_->SyncGetter<string16>(
-      &map_, object_id, version, &WebIDBDatabase::version);
-}
-
-void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnObjectStoreNames(
-    int32 idb_database_id, std::vector<string16>* object_stores) {
-  WebIDBDatabase* idb_database = parent_->GetOrTerminateProcess(
-      &map_, idb_database_id);
-  if (!idb_database)
-    return;
-
-  WebDOMStringList web_object_stores = idb_database->objectStoreNames();
-  object_stores->reserve(web_object_stores.length());
-  for (unsigned i = 0; i < web_object_stores.length(); ++i)
-    object_stores->push_back(web_object_stores.item(i));
-}
-
 void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnCreateObjectStore(
     const IndexedDBHostMsg_DatabaseCreateObjectStore_Params& params,
     int32* object_store_id, WebKit::WebExceptionCode* ec) {
@@ -538,10 +510,6 @@ bool IndexedDBDispatcherHost::IndexDispatcherHost::OnMessageReceived(
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(IndexedDBDispatcherHost::IndexDispatcherHost,
                            message, *msg_is_ok)
-    IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexName, OnName)
-    IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexKeyPath, OnKeyPath)
-    IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexUnique, OnUnique)
-    IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexMultiEntry, OnMultiEntry)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexOpenObjectCursor,
                                     OnOpenObjectCursor)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexOpenKeyCursor, OnOpenKeyCursor)
@@ -559,31 +527,6 @@ void IndexedDBDispatcherHost::IndexDispatcherHost::Send(
   parent_->Send(message);
 }
 
-void IndexedDBDispatcherHost::IndexDispatcherHost::OnName(
-    int32 object_id, string16* name) {
-  parent_->SyncGetter<string16>(&map_, object_id, name, &WebIDBIndex::name);
-}
-
-void IndexedDBDispatcherHost::IndexDispatcherHost::OnKeyPath(
-    int32 object_id, IndexedDBKeyPath* key_path) {
-  WebIDBIndex* idb_index = parent_->GetOrTerminateProcess(&map_, object_id);
-  if (!idb_index)
-    return;
-
-  *key_path = IndexedDBKeyPath(idb_index->keyPath());
-}
-
-void IndexedDBDispatcherHost::IndexDispatcherHost::OnUnique(
-    int32 object_id, bool* unique) {
-  parent_->SyncGetter<bool>(&map_, object_id, unique, &WebIDBIndex::unique);
-}
-
-void IndexedDBDispatcherHost::IndexDispatcherHost::OnMultiEntry(
-    int32 object_id, bool* multi_entry) {
-  parent_->SyncGetter<bool>(
-      &map_, object_id, multi_entry, &WebIDBIndex::multiEntry);
-}
-
 void IndexedDBDispatcherHost::IndexDispatcherHost::OnOpenObjectCursor(
     const IndexedDBHostMsg_IndexOpenCursor_Params& params,
     WebKit::WebExceptionCode* ec) {
@@ -711,11 +654,6 @@ bool IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnMessageReceived(
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(IndexedDBDispatcherHost::ObjectStoreDispatcherHost,
                            message, *msg_is_ok)
-    IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreName, OnName)
-    IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreKeyPath, OnKeyPath)
-    IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreIndexNames, OnIndexNames)
-    IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreAutoIncrement,
-                        OnAutoIncrement)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreGet, OnGet)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStorePut, OnPut)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreDelete, OnDelete)
@@ -736,41 +674,6 @@ void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::Send(
   parent_->Send(message);
 }
 
-void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnName(
-    int32 object_id, string16* name) {
-  parent_->SyncGetter<string16>(
-      &map_, object_id, name, &WebIDBObjectStore::name);
-}
-
-void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnKeyPath(
-    int32 object_id, IndexedDBKeyPath* key_path) {
-  WebIDBObjectStore* idb_object_store = parent_->GetOrTerminateProcess(
-      &map_,object_id);
-  if (!idb_object_store)
-    return;
-
-  *key_path = IndexedDBKeyPath(idb_object_store->keyPath());
-}
-
-void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnIndexNames(
-    int32 idb_object_store_id, std::vector<string16>* index_names) {
-  WebIDBObjectStore* idb_object_store = parent_->GetOrTerminateProcess(
-      &map_, idb_object_store_id);
-  if (!idb_object_store)
-    return;
-
-  WebDOMStringList web_index_names = idb_object_store->indexNames();
-  index_names->reserve(web_index_names.length());
-  for (unsigned i = 0; i < web_index_names.length(); ++i)
-    index_names->push_back(web_index_names.item(i));
-}
-
-void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnAutoIncrement(
-    int32 idb_object_store_id, bool* auto_increment) {
-  parent_->SyncGetter<bool>(&map_, idb_object_store_id, auto_increment,
-                            &WebIDBObjectStore::autoIncrement);
-}
-
 void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnGet(
     int idb_object_store_id,
     int32 thread_id,
diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.h b/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
index c4537e8..07010d9 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
@@ -119,10 +119,6 @@ class IndexedDBDispatcherHost : public content::BrowserMessageFilter {
 
     void OnMetadata(int32 idb_database_id,
                     IndexedDBDatabaseMetadata* metadata);
-    void OnName(int32 idb_database_id, string16* name);
-    void OnVersion(int32 idb_database_id, string16* version);
-    void OnObjectStoreNames(int32 idb_database_id,
-                            std::vector<string16>* object_stores);
     void OnCreateObjectStore(
         const IndexedDBHostMsg_DatabaseCreateObjectStore_Params& params,
         int32* object_store_id, WebKit::WebExceptionCode* ec);
@@ -158,11 +154,6 @@ class IndexedDBDispatcherHost : public content::BrowserMessageFilter {
     bool OnMessageReceived(const IPC::Message& message, bool *msg_is_ok);
     void Send(IPC::Message* message);
 
-    void OnName(int32 idb_index_id, string16* name);
-    void OnStoreName(int32 idb_index_id, string16* store_name);
-    void OnKeyPath(int32 idb_index_id, content::IndexedDBKeyPath* key_path);
-    void OnUnique(int32 idb_index_id, bool* unique);
-    void OnMultiEntry(int32 idb_index_id, bool* multi_entry);
     void OnOpenObjectCursor(
         const IndexedDBHostMsg_IndexOpenCursor_Params& params,
         WebKit::WebExceptionCode* ec);
@@ -196,12 +187,6 @@ class IndexedDBDispatcherHost : public content::BrowserMessageFilter {
     bool OnMessageReceived(const IPC::Message& message, bool *msg_is_ok);
     void Send(IPC::Message* message);
 
-    void OnName(int32 idb_object_store_id, string16* name);
-    void OnKeyPath(int32 idb_object_store_id,
-                   content::IndexedDBKeyPath* keyPath);
-    void OnIndexNames(int32 idb_object_store_id,
-                      std::vector<string16>* index_names);
-    void OnAutoIncrement(int32 idb_object_store_id, bool* auto_increment);
     void OnGet(int idb_object_store_id,
                int32 thread_id,
                int32 response_id,
diff --git a/content/common/indexed_db/indexed_db_messages.h b/content/common/indexed_db/indexed_db_messages.h
index be6a991..f86f6c4 100644
--- a/content/common/indexed_db/indexed_db_messages.h
+++ b/content/common/indexed_db/indexed_db_messages.h
@@ -337,21 +337,6 @@ IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_DatabaseMetadata,
                             int32, /* idb_database_id */
                             IndexedDBDatabaseMetadata /* metadata */)
 
-// WebIDBDatabase::name() message.
-IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_DatabaseName,
-                            int32, /* idb_database_id */
-                            string16 /* name */)
-
-// WebIDBDatabase::version() message.
-IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_DatabaseVersion,
-                            int32, /* idb_database_id */
-                            string16 /* version */)
-
-// WebIDBDatabase::objectStoreNames() message.
-IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_DatabaseObjectStoreNames,
-                            int32, /* idb_database_id */
-                            std::vector<string16> /* objectStoreNames */)
-
 // WebIDBDatabase::createObjectStore() message.
 IPC_SYNC_MESSAGE_CONTROL1_2(IndexedDBHostMsg_DatabaseCreateObjectStore,
                             IndexedDBHostMsg_DatabaseCreateObjectStore_Params,
@@ -400,26 +385,6 @@ IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseClose,
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseDestroyed,
                      int32 /* idb_database_id */)
 
-// WebIDBIndex::name() message.
-IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_IndexName,
-                            int32, /* idb_index_id */
-                            string16 /* name */)
-
-// WebIDBIndex::keyPath() message.
-IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_IndexKeyPath,
-                            int32, /* idb_index_id */
-                            content::IndexedDBKeyPath /* key_path */)
-
-// WebIDBIndex::unique() message.
-IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_IndexUnique,
-                            int32, /* idb_index_id */
-                            bool /* unique */)
-
-// WebIDBIndex::multiEntry() message.
-IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_IndexMultiEntry,
-                            int32, /* idb_index_id */
-                            bool /* multi_entry */)
-
 // WebIDBIndex::openObjectCursor() message.
 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_IndexOpenObjectCursor,
                             IndexedDBHostMsg_IndexOpenCursor_Params,
@@ -457,26 +422,6 @@ IPC_SYNC_MESSAGE_CONTROL5_1(IndexedDBHostMsg_IndexGetKey,
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_IndexDestroyed,
                      int32 /* idb_index_id */)
 
-// WebIDBObjectStore::name() message.
-IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_ObjectStoreName,
-                            int32, /* idb_object_store_id */
-                            string16 /* name */)
-
-// WebIDBObjectStore::keyPath() message.
-IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_ObjectStoreKeyPath,
-                            int32, /* idb_object_store_id */
-                            content::IndexedDBKeyPath /* keyPath */)
-
-// WebIDBObjectStore::indexNames() message.
-IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_ObjectStoreIndexNames,
-                            int32, /* idb_object_store_id */
-                            std::vector<string16> /* index_names */)
-
-// WebIDBObjectStore::autoIncrement() message.
-IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_ObjectStoreAutoIncrement,
-                            int32, /* idb_object_store_id */
-                            bool /* auto_increment */)
-
 // WebIDBObjectStore::get() message.
 IPC_SYNC_MESSAGE_CONTROL5_1(IndexedDBHostMsg_ObjectStoreGet,
                             int32, /* idb_object_store_id */
diff --git a/content/common/indexed_db/proxy_webidbdatabase_impl.cc b/content/common/indexed_db/proxy_webidbdatabase_impl.cc
index 0a8f9c4..dce36fd 100644
--- a/content/common/indexed_db/proxy_webidbdatabase_impl.cc
+++ b/content/common/indexed_db/proxy_webidbdatabase_impl.cc
@@ -79,32 +79,6 @@ WebIDBMetadata RendererWebIDBDatabaseImpl::metadata() const {
   return web_metadata;
 }
 
-WebString RendererWebIDBDatabaseImpl::name() const {
-  string16 result;
-  IndexedDBDispatcher::Send(
-      new IndexedDBHostMsg_DatabaseName(idb_database_id_, &result));
-  return result;
-}
-
-WebString RendererWebIDBDatabaseImpl::version() const {
-  string16 result;
-  IndexedDBDispatcher::Send(
-      new IndexedDBHostMsg_DatabaseVersion(idb_database_id_, &result));
-  return result;
-}
-
-WebDOMStringList RendererWebIDBDatabaseImpl::objectStoreNames() const {
-  std::vector<string16> result;
-  IndexedDBDispatcher::Send(
-      new IndexedDBHostMsg_DatabaseObjectStoreNames(idb_database_id_, &result));
-  WebDOMStringList webResult;
-  for (std::vector<string16>::const_iterator it = result.begin();
-       it != result.end(); ++it) {
-    webResult.append(*it);
-  }
-  return webResult;
-}
-
 WebKit::WebIDBObjectStore* RendererWebIDBDatabaseImpl::createObjectStore(
     const WebKit::WebString& name,
     const WebKit::WebIDBKeyPath& key_path,
diff --git a/content/common/indexed_db/proxy_webidbdatabase_impl.h b/content/common/indexed_db/proxy_webidbdatabase_impl.h
index 44d7650..4ec985a 100644
--- a/content/common/indexed_db/proxy_webidbdatabase_impl.h
+++ b/content/common/indexed_db/proxy_webidbdatabase_impl.h
@@ -23,9 +23,6 @@ class RendererWebIDBDatabaseImpl : public WebKit::WebIDBDatabase {
 
   // WebKit::WebIDBDatabase
   virtual WebKit::WebIDBMetadata metadata() const;
-  virtual WebKit::WebString name() const;
-  virtual WebKit::WebString version() const;
-  virtual WebKit::WebDOMStringList objectStoreNames() const;
   virtual WebKit::WebIDBObjectStore* createObjectStore(
       const WebKit::WebString& name,
       const WebKit::WebIDBKeyPath& key_path,
diff --git a/content/common/indexed_db/proxy_webidbindex_impl.cc b/content/common/indexed_db/proxy_webidbindex_impl.cc
index 73e0418..3a2e05d 100644
--- a/content/common/indexed_db/proxy_webidbindex_impl.cc
+++ b/content/common/indexed_db/proxy_webidbindex_impl.cc
@@ -33,34 +33,6 @@ RendererWebIDBIndexImpl::~RendererWebIDBIndexImpl() {
       idb_index_id_));
 }
 
-WebString RendererWebIDBIndexImpl::name() const {
-  string16 result;
-  IndexedDBDispatcher::Send(
-      new IndexedDBHostMsg_IndexName(idb_index_id_, &result));
-  return result;
-}
-
-WebIDBKeyPath RendererWebIDBIndexImpl::keyPath() const {
-  IndexedDBKeyPath result;
-  IndexedDBDispatcher::Send(
-      new IndexedDBHostMsg_IndexKeyPath(idb_index_id_, &result));
-  return result;
-}
-
-bool RendererWebIDBIndexImpl::unique() const {
-  bool result;
-  IndexedDBDispatcher::Send(
-      new IndexedDBHostMsg_IndexUnique(idb_index_id_, &result));
-  return result;
-}
-
-bool RendererWebIDBIndexImpl::multiEntry() const {
-  bool result;
-  IndexedDBDispatcher::Send(
-      new IndexedDBHostMsg_IndexMultiEntry(idb_index_id_, &result));
-  return result;
-}
-
 void RendererWebIDBIndexImpl::openObjectCursor(
     const WebKit::WebIDBKeyRange& range,
     unsigned short direction,
diff --git a/content/common/indexed_db/proxy_webidbindex_impl.h b/content/common/indexed_db/proxy_webidbindex_impl.h
index 05577f5..e95ea75 100644
--- a/content/common/indexed_db/proxy_webidbindex_impl.h
+++ b/content/common/indexed_db/proxy_webidbindex_impl.h
@@ -16,11 +16,6 @@ class RendererWebIDBIndexImpl : public WebKit::WebIDBIndex {
   virtual ~RendererWebIDBIndexImpl();
 
   // WebKit::WebIDBIndex
-  virtual WebKit::WebString name() const;
-  virtual WebKit::WebIDBKeyPath keyPath() const;
-  virtual bool unique() const;
-  virtual bool multiEntry() const;
-
   virtual void openObjectCursor(const WebKit::WebIDBKeyRange& range,
                                 unsigned short direction,
                                 WebKit::WebIDBCallbacks* callbacks,
diff --git a/content/common/indexed_db/proxy_webidbobjectstore_impl.cc b/content/common/indexed_db/proxy_webidbobjectstore_impl.cc
index 565452a..85a5838 100644
--- a/content/common/indexed_db/proxy_webidbobjectstore_impl.cc
+++ b/content/common/indexed_db/proxy_webidbobjectstore_impl.cc
@@ -46,41 +46,6 @@ RendererWebIDBObjectStoreImpl::~RendererWebIDBObjectStoreImpl() {
       new IndexedDBHostMsg_ObjectStoreDestroyed(idb_object_store_id_));
 }
 
-WebString RendererWebIDBObjectStoreImpl::name() const {
-  string16 result;
-  IndexedDBDispatcher::Send(
-      new IndexedDBHostMsg_ObjectStoreName(idb_object_store_id_, &result));
-  return result;
-}
-
-WebIDBKeyPath RendererWebIDBObjectStoreImpl::keyPath() const {
-  IndexedDBKeyPath result;
-  IndexedDBDispatcher::Send(
-      new IndexedDBHostMsg_ObjectStoreKeyPath(idb_object_store_id_, &result));
-  return result;
-}
-
-WebDOMStringList RendererWebIDBObjectStoreImpl::indexNames() const {
-  std::vector<string16> result;
-  IndexedDBDispatcher::Send(
-      new IndexedDBHostMsg_ObjectStoreIndexNames(
-          idb_object_store_id_, &result));
-  WebDOMStringList web_result;
-  for (std::vector<string16>::const_iterator it = result.begin();
-       it != result.end(); ++it) {
-    web_result.append(*it);
-  }
-  return web_result;
-}
-
-bool RendererWebIDBObjectStoreImpl::autoIncrement() const {
-  bool result;
-  IndexedDBDispatcher::Send(
-      new IndexedDBHostMsg_ObjectStoreAutoIncrement(
-          idb_object_store_id_, &result));
-  return result;
-}
-
 void RendererWebIDBObjectStoreImpl::get(
     const WebIDBKeyRange& key_range,
     WebIDBCallbacks* callbacks,
diff --git a/content/common/indexed_db/proxy_webidbobjectstore_impl.h b/content/common/indexed_db/proxy_webidbobjectstore_impl.h
index d8f2a77f..c9e6659 100644
--- a/content/common/indexed_db/proxy_webidbobjectstore_impl.h
+++ b/content/common/indexed_db/proxy_webidbobjectstore_impl.h
@@ -24,11 +24,6 @@ class RendererWebIDBObjectStoreImpl : public WebKit::WebIDBObjectStore {
   virtual ~RendererWebIDBObjectStoreImpl();
 
   // WebKit::WebIDBObjectStore
-  virtual WebKit::WebString name() const;
-  virtual WebKit::WebIDBKeyPath keyPath() const;
-  virtual WebKit::WebDOMStringList indexNames() const;
-  virtual bool autoIncrement() const;
-
   virtual void get(const WebKit::WebIDBKeyRange& key_range,
                    WebKit::WebIDBCallbacks* callbacks,
                    const WebKit::WebIDBTransaction& transaction,