Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(274)

Unified Diff: trunk/src/net/socket_stream/socket_stream_job.cc

Issue 197463003: Revert 256579 "Allow the content browser client to specify a spe..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/net/socket_stream/socket_stream_job.cc
===================================================================
--- trunk/src/net/socket_stream/socket_stream_job.cc (revision 256581)
+++ trunk/src/net/socket_stream/socket_stream_job.cc (working copy)
@@ -24,9 +24,7 @@
const GURL& url,
SocketStream::Delegate* delegate,
TransportSecurityState* sts,
- SSLConfigService* ssl,
- URLRequestContext* context,
- CookieStore* cookie_store) {
+ SSLConfigService* ssl) {
GURL socket_url(url);
TransportSecurityState::DomainState domain_state;
if (url.scheme() == "ws" && sts && sts->GetDomainState(
@@ -38,8 +36,7 @@
url_parse::Component(0, strlen(kNewScheme)));
socket_url = url.ReplaceComponents(replacements);
}
- return SocketStreamJobManager::GetInstance()->CreateJob(
- socket_url, delegate, context, cookie_store);
+ return SocketStreamJobManager::GetInstance()->CreateJob(socket_url, delegate);
}
SocketStreamJob::SocketStreamJob() {}
@@ -85,11 +82,6 @@
socket_->DetachDelegate();
}
-void SocketStreamJob::DetachContext() {
- if (socket_.get())
- socket_->DetachContext();
-}
-
SocketStreamJob::~SocketStreamJob() {}
} // namespace net
« no previous file with comments | « trunk/src/net/socket_stream/socket_stream_job.h ('k') | trunk/src/net/socket_stream/socket_stream_job_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698