summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-05 22:00:24 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-05 22:00:24 +0000
commit2b83813511561091e570f15a76ae830e7ccdf8bb (patch)
tree12c5c160730417696e9cb49f083bd4cc67302851 /webkit/tools
parent746750b6d511d7febcbc8d1930f0bb7971dbbab5 (diff)
downloadchromium_src-2b83813511561091e570f15a76ae830e7ccdf8bb.zip
chromium_src-2b83813511561091e570f15a76ae830e7ccdf8bb.tar.gz
chromium_src-2b83813511561091e570f15a76ae830e7ccdf8bb.tar.bz2
Refactor to address URLRequestContext dependency added in
http://codereview.chromium.org/6873029/ BUG=81009 Review URL: http://codereview.chromium.org/6930040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/simple_socket_stream_bridge.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
index a555b48..43ee58e 100644
--- a/webkit/tools/test_shell/simple_socket_stream_bridge.cc
+++ b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
@@ -157,7 +157,8 @@ void WebSocketStreamHandleBridgeImpl::OnClose(net::SocketStream* socket) {
void WebSocketStreamHandleBridgeImpl::DoConnect(const GURL& url) {
DCHECK(MessageLoop::current() == g_io_thread);
socket_ = net::SocketStreamJob::CreateSocketStreamJob(
- url, this, *g_request_context);
+ url, this, g_request_context->transport_security_state(),
+ g_request_context->ssl_config_service());
socket_->set_context(g_request_context);
socket_->Connect();
}