Chromium side of "consolidate two-phase connection to avoid race conditions".

content/browser/in_process_webkit/indexed_db_dispatcher_host.cc

Index: content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
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 fd8f318e1c1901f4d97fd7a84259bc0f445621dc..c8150d2ecf22ca25957d43b67ea095034bbfe15b 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
@@ -240,6 +240,8 @@ void IndexedDBDispatcherHost::OnIDBFactoryOpen(
       params.version,
       new IndexedDBCallbacksDatabase(this, params.thread_id,
                                      params.response_id, origin_url),
+      new IndexedDBDatabaseCallbacks(this, params.thread_id,

[jsbell, 2012/09/05 22:35:09]

So... how about those awesome class names?

+                                     params.database_response_id),
       origin, NULL, webkit_glue::FilePathToWebString(indexed_db_path));
 }
 
@@ -320,7 +322,6 @@ bool IndexedDBDispatcherHost::DatabaseDispatcherHost::OnMessageReceived(
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseSetVersion, OnSetVersion)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseTransaction, OnTransaction)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseClose, OnClose)
-    IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseOpen, OnOpen)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseDestroyed, OnDestroyed)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ -452,16 +453,6 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnTransaction(
                              database_url_map_[idb_database_id]);
 }
 
-void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnOpen(
-    int32 idb_database_id, int32 thread_id, int32 response_id) {
-  WebIDBDatabase* database = parent_->GetOrTerminateProcess(
-      &map_, idb_database_id);
-  if (!database)
-    return;
-  database->open(new IndexedDBDatabaseCallbacks(parent_, thread_id,
-                                                response_id));
-}
-
 void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnClose(
     int32 idb_database_id) {
   WebIDBDatabase* database = parent_->GetOrTerminateProcess(