Fix some bugs that only show up when running layout tests manually

chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/host_content_settings_map.h"
@@ skipping 91 matching lines @@
 
   database_dispatcher_host_.reset();
   index_dispatcher_host_.reset();
 }
 
 bool IndexedDBDispatcherHost::OnMessageReceived(const IPC::Message& message) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
   DCHECK(process_handle_);
 
   switch (message.type()) {
-    case ViewHostMsg_IDBCursorDestroyed::ID:
     case ViewHostMsg_IDBCursorDirection::ID:
     case ViewHostMsg_IDBCursorKey::ID:
     case ViewHostMsg_IDBCursorValue::ID:
     case ViewHostMsg_IDBCursorUpdate::ID:
     case ViewHostMsg_IDBCursorContinue::ID:
     case ViewHostMsg_IDBCursorRemove::ID:
+    case ViewHostMsg_IDBCursorDestroyed::ID:
     case ViewHostMsg_IDBFactoryOpen::ID:
     case ViewHostMsg_IDBFactoryAbortPendingTransactions::ID:
     case ViewHostMsg_IDBDatabaseName::ID:
     case ViewHostMsg_IDBDatabaseDescription::ID:
     case ViewHostMsg_IDBDatabaseVersion::ID:
     case ViewHostMsg_IDBDatabaseObjectStores::ID:
     case ViewHostMsg_IDBDatabaseCreateObjectStore::ID:
     case ViewHostMsg_IDBDatabaseObjectStore::ID:
     case ViewHostMsg_IDBDatabaseRemoveObjectStore::ID:
     case ViewHostMsg_IDBDatabaseSetVersion::ID:
     case ViewHostMsg_IDBDatabaseTransaction::ID:
     case ViewHostMsg_IDBDatabaseDestroyed::ID:
     case ViewHostMsg_IDBIndexName::ID:
     case ViewHostMsg_IDBIndexStoreName::ID:
     case ViewHostMsg_IDBIndexKeyPath::ID:
     case ViewHostMsg_IDBIndexUnique::ID:
     case ViewHostMsg_IDBIndexDestroyed::ID:
     case ViewHostMsg_IDBIndexOpenObjectCursor::ID:
     case ViewHostMsg_IDBIndexOpenCursor::ID:
     case ViewHostMsg_IDBIndexGetObject::ID:
     case ViewHostMsg_IDBIndexGet::ID:
     case ViewHostMsg_IDBObjectStoreName::ID:
     case ViewHostMsg_IDBObjectStoreKeyPath::ID:
     case ViewHostMsg_IDBObjectStoreIndexNames::ID:
     case ViewHostMsg_IDBObjectStoreGet::ID:
-    case ViewHostMsg_IDBObjectStoreOpenCursor::ID:
     case ViewHostMsg_IDBObjectStorePut::ID:
     case ViewHostMsg_IDBObjectStoreRemove::ID:
     case ViewHostMsg_IDBObjectStoreCreateIndex::ID:
     case ViewHostMsg_IDBObjectStoreIndex::ID:
     case ViewHostMsg_IDBObjectStoreRemoveIndex::ID:
+    case ViewHostMsg_IDBObjectStoreOpenCursor::ID:
     case ViewHostMsg_IDBObjectStoreDestroyed::ID:
     case ViewHostMsg_IDBTransactionDestroyed::ID:
     case ViewHostMsg_IDBTransactionObjectStore::ID:
       break;
     default:
       return false;
   }
 
   bool success = ChromeThread::PostTask(
       ChromeThread::WEBKIT, FROM_HERE, NewRunnableMethod(
@@ skipping 345 matching lines @@
 
 IndexedDBDispatcherHost::IndexDispatcherHost::~IndexDispatcherHost() {
 }
 
 bool IndexedDBDispatcherHost::IndexDispatcherHost::OnMessageReceived(
     const IPC::Message& message, bool* msg_is_ok) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(IndexedDBDispatcherHost::IndexDispatcherHost,
                            message, *msg_is_ok)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_IDBIndexName, OnName)
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_IDBIndexStoreName, OnStoreName)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_IDBIndexKeyPath, OnKeyPath)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_IDBIndexUnique, OnUnique)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_IDBIndexOpenObjectCursor,
+                        OnOpenObjectCursor)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_IDBIndexOpenCursor, OnOpenCursor)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_IDBIndexGetObject, OnGetObject)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_IDBIndexGet, OnGet)
     IPC_MESSAGE_HANDLER(ViewHostMsg_IDBIndexDestroyed, OnDestroyed)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void IndexedDBDispatcherHost::IndexDispatcherHost::Send(
     IPC::Message* message) {
   // The macro magic in OnMessageReceived requires this to link, but it should
   // never actually be called.
   NOTREACHED();
   parent_->Send(message);
 }
 
 void IndexedDBDispatcherHost::IndexDispatcherHost::OnName(
     int32 object_id, IPC::Message* reply_msg) {
   parent_->SyncGetter<string16, ViewHostMsg_IDBIndexName>(
       &map_, object_id, reply_msg, &WebIDBIndex::name);
 }
 
+void IndexedDBDispatcherHost::IndexDispatcherHost::OnStoreName(
+    int32 object_id, IPC::Message* reply_msg) {
+  parent_->SyncGetter<string16, ViewHostMsg_IDBIndexStoreName>(
+      &map_, object_id, reply_msg, &WebIDBIndex::storeName);
+}
+
 void IndexedDBDispatcherHost::IndexDispatcherHost::OnKeyPath(
     int32 object_id, IPC::Message* reply_msg) {
   parent_->SyncGetter<NullableString16, ViewHostMsg_IDBIndexKeyPath>(
       &map_, object_id, reply_msg, &WebIDBIndex::keyPath);
 }
 
 void IndexedDBDispatcherHost::IndexDispatcherHost::OnUnique(
     int32 object_id, IPC::Message* reply_msg) {
   parent_->SyncGetter<bool, ViewHostMsg_IDBIndexUnique>(
       &map_, object_id, reply_msg, &WebIDBIndex::unique);
@@ skipping 398 matching lines @@
   ViewHostMsg_IDBTransactionObjectStore::WriteReplyParams(
          reply_msg, object_id);
   parent_->Send(reply_msg);
 }
 
 void IndexedDBDispatcherHost::TransactionDispatcherHost::OnDestroyed(
     int32 object_id) {
   parent_->DestroyObject(
       &map_, object_id, ViewHostMsg_IDBTransactionDestroyed::ID);
 }