summaryrefslogtreecommitdiffstats
path: root/net/websockets/websocket_job.cc
diff options
context:
space:
mode:
authortoyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 05:17:18 +0000
committertoyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 05:17:18 +0000
commitb42e5d55a8a7af4dac0b4942607d07220cec6b5c (patch)
treea36b078af3456568ebdb0d694d7a3043c951b051 /net/websockets/websocket_job.cc
parent9c5a25de8ae88a35c1abdaa088ae76c7b70e51a3 (diff)
downloadchromium_src-b42e5d55a8a7af4dac0b4942607d07220cec6b5c.zip
chromium_src-b42e5d55a8a7af4dac0b4942607d07220cec6b5c.tar.gz
chromium_src-b42e5d55a8a7af4dac0b4942607d07220cec6b5c.tar.bz2
Introduce a new connection test which verify WebSocket and SPDY connection sequence after throttling work.
BUG=NONE TEST=net_unittest --gtest_filter=WebSocketJobTest.Throttling\* Review URL: http://codereview.chromium.org/7331007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets/websocket_job.cc')
-rw-r--r--net/websockets/websocket_job.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc
index b627a07..68aa1b6 100644
--- a/net/websockets/websocket_job.cc
+++ b/net/websockets/websocket_job.cc
@@ -180,6 +180,10 @@ int WebSocketJob::OnStartOpenConnection(
state_ = CONNECTING;
addresses_ = socket->address_list();
WebSocketThrottle::GetInstance()->PutInQueue(this);
+ if (delegate_) {
+ int result = delegate_->OnStartOpenConnection(socket, callback);
+ DCHECK_EQ(OK, result);
+ }
if (waiting_) {
// PutInQueue() may set |waiting_| true for throttling. In this case,
// Wakeup() will be called later.