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

webkit/support/test_webkit_platform_support.cc

Index: webkit/support/test_webkit_platform_support.cc
diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc
index 1d0ea22c7895bb44ad78cd3e728d749baf06324d..7104d5319eb32473de5cf4ef65270abc10d53c72 100644
--- a/webkit/support/test_webkit_platform_support.cc
+++ b/webkit/support/test_webkit_platform_support.cc
@@ -349,6 +349,7 @@ class TestWebIDBFactory : public WebKit::WebIDBFactory {
                                dataDir.isEmpty() ? data_dir_ : dataDir);
   }
 
+  // TODO(jsbell): Remove this overload when WK94011 rolls.
   virtual void open(const WebString& name,
                     long long version,
                     WebKit::WebIDBCallbacks* callbacks,
@@ -359,6 +360,17 @@ class TestWebIDBFactory : public WebKit::WebIDBFactory {
                    dataDir.isEmpty() ? data_dir_ : dataDir);
   }
 
+  virtual void open(const WebString& name,
+                    long long version,
+                    WebKit::WebIDBCallbacks* callbacks,
+                    WebKit::WebIDBDatabaseCallbacks* databaseCallbacks,
+                    const WebKit::WebSecurityOrigin& origin,
+                    WebKit::WebFrame* frame,
+                    const WebString& dataDir) {
+    factory_->open(name, version, callbacks, databaseCallbacks, origin, frame,
+                   dataDir.isEmpty() ? data_dir_ : dataDir);
+  }
+
   virtual void deleteDatabase(const WebString& name,
                               WebKit::WebIDBCallbacks* callbacks,
                               const WebKit::WebSecurityOrigin& origin,