summaryrefslogtreecommitdiffstats
path: root/net/websockets
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 /net/websockets
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 'net/websockets')
-rw-r--r--net/websockets/websocket_job_unittest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc
index db29ee6..eb4bca1 100644
--- a/net/websockets/websocket_job_unittest.cc
+++ b/net/websockets/websocket_job_unittest.cc
@@ -509,13 +509,15 @@ TEST_F(WebSocketJobTest, HSTSUpgrade) {
GURL url("ws://upgrademe.com/");
MockSocketStreamDelegate delegate;
scoped_refptr<SocketStreamJob> job = SocketStreamJob::CreateSocketStreamJob(
- url, &delegate, *context_.get());
+ url, &delegate, context_->transport_security_state(),
+ context_->ssl_config_service());
EXPECT_TRUE(GetSocket(job.get())->is_secure());
job->DetachDelegate();
url = GURL("ws://donotupgrademe.com/");
job = SocketStreamJob::CreateSocketStreamJob(
- url, &delegate, *context_.get());
+ url, &delegate, context_->transport_security_state(),
+ context_->ssl_config_service());
EXPECT_FALSE(GetSocket(job.get())->is_secure());
job->DetachDelegate();
}