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

content/common/indexed_db/proxy_webidbfactory_impl.cc

Index: content/common/indexed_db/proxy_webidbfactory_impl.cc
diff --git a/content/common/indexed_db/proxy_webidbfactory_impl.cc b/content/common/indexed_db/proxy_webidbfactory_impl.cc
index d4bd56917e75c255aee35eaff511c68213866e0b..3e401d6c65eda078b624a10e82cda3055805ea2c 100644
--- a/content/common/indexed_db/proxy_webidbfactory_impl.cc
+++ b/content/common/indexed_db/proxy_webidbfactory_impl.cc
@@ -13,6 +13,7 @@ using WebKit::WebDOMStringList;
 using WebKit::WebFrame;
 using WebKit::WebIDBCallbacks;
 using WebKit::WebIDBDatabase;
+using WebKit::WebIDBDatabaseCallbacks;
 using WebKit::WebSecurityOrigin;
 using WebKit::WebString;
 
@@ -33,6 +34,7 @@ void RendererWebIDBFactoryImpl::getDatabaseNames(
       callbacks, origin.databaseIdentifier(), web_frame);
 }
 
+// TODO(jsbell): Remove this overload when WK90411 rolls.
 void RendererWebIDBFactoryImpl::open(
     const WebString& name,
     long long version,
@@ -48,6 +50,23 @@ void RendererWebIDBFactoryImpl::open(
       name, version, callbacks, origin.databaseIdentifier(), web_frame);
 }
 
+void RendererWebIDBFactoryImpl::open(
+    const WebString& name,
+    long long version,
+    WebIDBCallbacks* callbacks,
+    WebIDBDatabaseCallbacks* database_callbacks,
+    const WebSecurityOrigin& origin,
+    WebFrame* web_frame,
+    const WebString& data_dir) {
+  // Don't send the data_dir. We know what we want on the Browser side of
+  // things.
+  IndexedDBDispatcher* dispatcher =
+      IndexedDBDispatcher::ThreadSpecificInstance();
+  dispatcher->RequestIDBFactoryOpen(
+      name, version, callbacks, database_callbacks, origin.databaseIdentifier(),
+      web_frame);
+}
+
 void RendererWebIDBFactoryImpl::deleteDatabase(
     const WebString& name,
     WebIDBCallbacks* callbacks,