Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Side by Side Diff: webkit/support/test_webkit_platform_support.cc

Issue 10917099: Chromium side of "consolidate two-phase connection to avoid race conditions". (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/support/test_webkit_platform_support.h" 5 #include "webkit/support/test_webkit_platform_support.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/metrics/stats_counters.h" 8 #include "base/metrics/stats_counters.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/scoped_temp_dir.h" 10 #include "base/scoped_temp_dir.h"
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 const WebKit::WebSecurityOrigin& origin, 345 const WebKit::WebSecurityOrigin& origin,
346 WebKit::WebFrame* frame, 346 WebKit::WebFrame* frame,
347 const WebString& dataDir) { 347 const WebString& dataDir) {
348 factory_->getDatabaseNames(callbacks, origin, frame, 348 factory_->getDatabaseNames(callbacks, origin, frame,
349 dataDir.isEmpty() ? data_dir_ : dataDir); 349 dataDir.isEmpty() ? data_dir_ : dataDir);
350 } 350 }
351 351
352 virtual void open(const WebString& name, 352 virtual void open(const WebString& name,
353 long long version, 353 long long version,
354 WebKit::WebIDBCallbacks* callbacks, 354 WebKit::WebIDBCallbacks* callbacks,
355 WebKit::WebIDBDatabaseCallbacks* databaseCallbacks,
355 const WebKit::WebSecurityOrigin& origin, 356 const WebKit::WebSecurityOrigin& origin,
356 WebKit::WebFrame* frame, 357 WebKit::WebFrame* frame,
357 const WebString& dataDir) { 358 const WebString& dataDir) {
358 factory_->open(name, version, callbacks, origin, frame, 359 factory_->open(name, version, callbacks, databaseCallbacks, origin, frame,
359 dataDir.isEmpty() ? data_dir_ : dataDir); 360 dataDir.isEmpty() ? data_dir_ : dataDir);
360 } 361 }
361 362
362 virtual void deleteDatabase(const WebString& name, 363 virtual void deleteDatabase(const WebString& name,
363 WebKit::WebIDBCallbacks* callbacks, 364 WebKit::WebIDBCallbacks* callbacks,
364 const WebKit::WebSecurityOrigin& origin, 365 const WebKit::WebSecurityOrigin& origin,
365 WebKit::WebFrame* frame, 366 WebKit::WebFrame* frame,
366 const WebString& dataDir) { 367 const WebString& dataDir) {
367 factory_->deleteDatabase(name, callbacks, origin, frame, 368 factory_->deleteDatabase(name, callbacks, origin, frame,
368 dataDir.isEmpty() ? data_dir_ : dataDir); 369 dataDir.isEmpty() ? data_dir_ : dataDir);
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 490
490 WebKit::WebRTCPeerConnectionHandler* 491 WebKit::WebRTCPeerConnectionHandler*
491 TestWebKitPlatformSupport::createRTCPeerConnectionHandler( 492 TestWebKitPlatformSupport::createRTCPeerConnectionHandler(
492 WebKit::WebRTCPeerConnectionHandlerClient* client) { 493 WebKit::WebRTCPeerConnectionHandlerClient* client) {
493 if (shadow_platform_delegate_) 494 if (shadow_platform_delegate_)
494 return shadow_platform_delegate_->createRTCPeerConnectionHandler(client); 495 return shadow_platform_delegate_->createRTCPeerConnectionHandler(client);
495 496
496 return webkit_glue::WebKitPlatformSupportImpl::createRTCPeerConnectionHandler( 497 return webkit_glue::WebKitPlatformSupportImpl::createRTCPeerConnectionHandler(
497 client); 498 client);
498 } 499 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698