| Index: content/browser/renderer_host/socket_stream_host.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/socket_stream_host.cc (revision 255909)
|
| +++ content/browser/renderer_host/socket_stream_host.cc (working copy)
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "content/common/socket_stream.h"
|
| +#include "content/public/browser/content_browser_client.h"
|
| #include "net/socket_stream/socket_stream_job.h"
|
| #include "net/url_request/url_request_context.h"
|
|
|
| @@ -28,9 +29,11 @@
|
|
|
| SocketStreamHost::SocketStreamHost(
|
| net::SocketStream::Delegate* delegate,
|
| + int child_id,
|
| int render_frame_id,
|
| int socket_id)
|
| : delegate_(delegate),
|
| + child_id_(child_id),
|
| render_frame_id_(render_frame_id),
|
| socket_id_(socket_id) {
|
| DCHECK_NE(socket_id_, kNoSocketId);
|
| @@ -51,7 +54,7 @@
|
|
|
| SocketStreamHost::~SocketStreamHost() {
|
| VLOG(1) << "SocketStreamHost destructed socket_id=" << socket_id_;
|
| - job_->set_context(NULL);
|
| + job_->DetachContext();
|
| job_->DetachDelegate();
|
| }
|
|
|
| @@ -60,8 +63,10 @@
|
| VLOG(1) << "SocketStreamHost::Connect url=" << url;
|
| job_ = net::SocketStreamJob::CreateSocketStreamJob(
|
| url, delegate_, request_context->transport_security_state(),
|
| - request_context->ssl_config_service());
|
| - job_->set_context(request_context);
|
| + request_context->ssl_config_service(),
|
| + request_context,
|
| + GetContentClient()->browser()->OverrideCookieStoreForRenderProcess(
|
| + child_id_));
|
| job_->SetUserData(kSocketIdKey, new SocketStreamId(socket_id_));
|
| job_->Connect();
|
| }
|
|
|