diff options
Diffstat (limited to 'net/websockets/websocket_job_test.cc')
| -rw-r--r-- | net/websockets/websocket_job_test.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/net/websockets/websocket_job_test.cc b/net/websockets/websocket_job_test.cc index 31bd9d6..3d7d424 100644 --- a/net/websockets/websocket_job_test.cc +++ b/net/websockets/websocket_job_test.cc @@ -41,8 +41,9 @@ namespace { class MockSocketStream : public SocketStream { public: - MockSocketStream(const GURL& url, SocketStream::Delegate* delegate) - : SocketStream(url, delegate) {} + MockSocketStream(const GURL& url, SocketStream::Delegate* delegate, + URLRequestContext* context, CookieStore* cookie_store) + : SocketStream(url, delegate, context, cookie_store) {} virtual void Connect() OVERRIDE {} virtual bool SendData(const char* data, int len) OVERRIDE { @@ -364,7 +365,8 @@ class WebSocketJobTest : public PlatformTest, websocket_ = new WebSocketJob(delegate); if (stream_type == STREAM_MOCK_SOCKET) - socket_ = new MockSocketStream(url, websocket_.get()); + socket_ = new MockSocketStream(url, websocket_.get(), context_.get(), + NULL); if (stream_type == STREAM_SOCKET || stream_type == STREAM_SPDY_WEBSOCKET) { if (stream_type == STREAM_SPDY_WEBSOCKET) { @@ -380,7 +382,7 @@ class WebSocketJobTest : public PlatformTest, host_resolver_.reset(new MockHostResolver); context_->set_host_resolver(host_resolver_.get()); - socket_ = new SocketStream(url, websocket_.get()); + socket_ = new SocketStream(url, websocket_.get(), context_.get(), NULL); socket_factory_.reset(new MockClientSocketFactory); DCHECK(data_.get()); socket_factory_->AddSocketDataProvider(data_.get()); @@ -388,7 +390,6 @@ class WebSocketJobTest : public PlatformTest, } websocket_->InitSocketStream(socket_.get()); - websocket_->set_context(context_.get()); // MockHostResolver resolves all hosts to 127.0.0.1; however, when we create // a WebSocketJob purely to block another one in a throttling test, we don't // perform a real connect. In that case, the following address is used @@ -738,14 +739,14 @@ void WebSocketJobTest::TestHSTSUpgrade() { scoped_refptr<SocketStreamJob> job = SocketStreamJob::CreateSocketStreamJob( url, &delegate, context_->transport_security_state(), - context_->ssl_config_service()); + context_->ssl_config_service(), NULL, NULL); EXPECT_TRUE(GetSocket(job.get())->is_secure()); job->DetachDelegate(); url = GURL("ws://donotupgrademe.com/"); job = SocketStreamJob::CreateSocketStreamJob( url, &delegate, context_->transport_security_state(), - context_->ssl_config_service()); + context_->ssl_config_service(), NULL, NULL); EXPECT_FALSE(GetSocket(job.get())->is_secure()); job->DetachDelegate(); } |