| Index: net/socket_stream/socket_stream_job.cc
|
| ===================================================================
|
| --- net/socket_stream/socket_stream_job.cc (revision 255909)
|
| +++ net/socket_stream/socket_stream_job.cc (working copy)
|
| @@ -24,7 +24,9 @@
|
| const GURL& url,
|
| SocketStream::Delegate* delegate,
|
| TransportSecurityState* sts,
|
| - SSLConfigService* ssl) {
|
| + SSLConfigService* ssl,
|
| + URLRequestContext* context,
|
| + CookieStore* cookie_store) {
|
| GURL socket_url(url);
|
| TransportSecurityState::DomainState domain_state;
|
| if (url.scheme() == "ws" && sts && sts->GetDomainState(
|
| @@ -36,7 +38,8 @@
|
| url_parse::Component(0, strlen(kNewScheme)));
|
| socket_url = url.ReplaceComponents(replacements);
|
| }
|
| - return SocketStreamJobManager::GetInstance()->CreateJob(socket_url, delegate);
|
| + return SocketStreamJobManager::GetInstance()->CreateJob(
|
| + socket_url, delegate, context, cookie_store);
|
| }
|
|
|
| SocketStreamJob::SocketStreamJob() {}
|
| @@ -82,6 +85,11 @@
|
| socket_->DetachDelegate();
|
| }
|
|
|
| +void SocketStreamJob::DetachContext() {
|
| + if (socket_.get())
|
| + socket_->DetachContext();
|
| +}
|
| +
|
| SocketStreamJob::~SocketStreamJob() {}
|
|
|
| } // namespace net
|
|
|