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

content/common/indexed_db/indexed_db_dispatcher.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 #define CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 52 matching lines @@
   virtual void OnWorkerRunLoopStopped() OVERRIDE;
 
   void OnMessageReceived(const IPC::Message& msg);
   static bool Send(IPC::Message* msg);
 
   void RequestIDBFactoryGetDatabaseNames(
       WebKit::WebIDBCallbacks* callbacks,
       const string16& origin,
       WebKit::WebFrame* web_frame);
 
+  // TODO(jsbell): Remove this overload once WK90411 rolls.
+  void RequestIDBFactoryOpen(
+      const string16& name,
+      int64 version,
+      WebKit::WebIDBCallbacks* callbacks,
+       const string16& origin,
+      WebKit::WebFrame* web_frame);
+
   void RequestIDBFactoryOpen(
       const string16& name,
       int64 version,
       WebKit::WebIDBCallbacks* callbacks,
+      WebKit::WebIDBDatabaseCallbacks* database_callbacks,
       const string16& origin,
       WebKit::WebFrame* web_frame);
 
   void RequestIDBFactoryDeleteDatabase(
       const string16& name,
       WebKit::WebIDBCallbacks* callbacks,
       const string16& origin,
       WebKit::WebFrame* web_frame);
 
   void RequestIDBCursorAdvance(
@@ skipping 195 matching lines @@
 
   // Map from cursor id to RendererWebIDBCursorImpl.
   std::map<int32, RendererWebIDBCursorImpl*> cursors_;
 
   std::map<int32, RendererWebIDBDatabaseImpl*> databases_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBDispatcher);
 };
 
 #endif  // CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_