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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket_stream/socket_stream_job.cc

Issue 6930040: Refactor to address URLRequestContext dependency added in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 8 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
« no previous file with comments | « net/socket_stream/socket_stream_job.h ('k') | net/url_request/url_request_context.h » ('j') | net/url_request/url_request_http_job.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket_stream/socket_stream_job.cc
===================================================================
--- net/socket_stream/socket_stream_job.cc (revision 84202)
+++ net/socket_stream/socket_stream_job.cc (working copy)
@@ -22,13 +22,12 @@
SocketStreamJob* SocketStreamJob::CreateSocketStreamJob(
const GURL& url,
SocketStream::Delegate* delegate,
- const URLRequestContext& context) {
+ TransportSecurityState* sts,
+ SSLConfigService* ssl) {
GURL socket_url(url);
TransportSecurityState::DomainState domain_state;
- if (url.scheme() == "ws" &&
- context.transport_security_state() &&
- context.transport_security_state()->IsEnabledForHost(
- &domain_state, url.host(), context.IsSNIAvailable()) &&
+ if (url.scheme() == "ws" && sts && sts->IsEnabledForHost(
+ &domain_state, url.host(), SSLConfigService::IsSNIAvailable(ssl)) &&
willchan no longer on Chromium 2011/05/05 18:00:35 please include ssl_config_service.h for this
Chris Evans 2011/05/05 22:00:56 Done.
domain_state.mode == TransportSecurityState::DomainState::MODE_STRICT) {
url_canon::Replacements<char> replacements;
static const char kNewScheme[] = "wss";
« no previous file with comments | « net/socket_stream/socket_stream_job.h ('k') | net/url_request/url_request_context.h » ('j') | net/url_request/url_request_http_job.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698