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

webkit/support/test_webkit_platform_support.cc

 // 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.
 
 #include "webkit/support/test_webkit_platform_support.h"
 
 #include "base/file_util.h"
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 331 matching lines @@
   }
 
   virtual void getDatabaseNames(WebKit::WebIDBCallbacks* callbacks,
                                 const WebKit::WebSecurityOrigin& origin,
                                 WebKit::WebFrame* frame,
                                 const WebString& dataDir) {
     factory_->getDatabaseNames(callbacks, origin, frame,
                                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,
                     const WebKit::WebSecurityOrigin& origin,
                     WebKit::WebFrame* frame,
                     const WebString& dataDir) {
     factory_->open(name, version, callbacks, origin, frame,
                    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,
                               WebKit::WebFrame* frame,
                               const WebString& dataDir) {
     factory_->deleteDatabase(name, callbacks, origin, frame,
                              dataDir.isEmpty() ? data_dir_ : dataDir);
   }
  private:
   scoped_ptr<WebIDBFactory> factory_;
@@ skipping 117 matching lines @@
 
 WebKit::WebRTCPeerConnectionHandler*
 TestWebKitPlatformSupport::createRTCPeerConnectionHandler(
     WebKit::WebRTCPeerConnectionHandlerClient* client) {
   if (shadow_platform_delegate_)
     return shadow_platform_delegate_->createRTCPeerConnectionHandler(client);
 
   return webkit_glue::WebKitPlatformSupportImpl::createRTCPeerConnectionHandler(
       client);
 }