OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/socket_stream/socket_stream_job.h" | 5 #include "net/socket_stream/socket_stream_job.h" |
6 | 6 |
7 #include "base/memory/singleton.h" | 7 #include "base/memory/singleton.h" |
8 #include "net/http/transport_security_state.h" | 8 #include "net/http/transport_security_state.h" |
9 #include "net/socket_stream/socket_stream_job_manager.h" | 9 #include "net/socket_stream/socket_stream_job_manager.h" |
10 #include "net/ssl/ssl_config_service.h" | 10 #include "net/ssl/ssl_config_service.h" |
11 #include "net/url_request/url_request_context.h" | 11 #include "net/url_request/url_request_context.h" |
12 | 12 |
13 namespace net { | 13 namespace net { |
14 | 14 |
15 // static | 15 // static |
16 SocketStreamJob::ProtocolFactory* SocketStreamJob::RegisterProtocolFactory( | 16 SocketStreamJob::ProtocolFactory* SocketStreamJob::RegisterProtocolFactory( |
17 const std::string& scheme, ProtocolFactory* factory) { | 17 const std::string& scheme, ProtocolFactory* factory) { |
18 return SocketStreamJobManager::GetInstance()->RegisterProtocolFactory( | 18 return SocketStreamJobManager::GetInstance()->RegisterProtocolFactory( |
19 scheme, factory); | 19 scheme, factory); |
20 } | 20 } |
21 | 21 |
22 // static | 22 // static |
23 SocketStreamJob* SocketStreamJob::CreateSocketStreamJob( | 23 SocketStreamJob* SocketStreamJob::CreateSocketStreamJob( |
24 const GURL& url, | 24 const GURL& url, |
25 SocketStream::Delegate* delegate, | 25 SocketStream::Delegate* delegate, |
26 TransportSecurityState* sts, | 26 TransportSecurityState* sts, |
27 SSLConfigService* ssl) { | 27 SSLConfigService* ssl) { |
28 GURL socket_url(url); | 28 GURL socket_url(url); |
29 TransportSecurityState::DomainState domain_state; | 29 TransportSecurityState::DomainState domain_state; |
30 if (url.scheme() == "ws" && sts && sts->GetDomainState( | 30 if (url.scheme() == "ws" && sts && |
31 url.host(), SSLConfigService::IsSNIAvailable(ssl), &domain_state) && | 31 sts->GetDomainState(url.host(), |
32 SSLConfigService::IsSNIAvailable(ssl), | |
33 delegate->CanGetCookies(NULL, url), | |
Ryan Sleevi
2013/08/06 22:32:11
See remark about url needing to be scheme-fixed.
mef
2013/08/09 17:04:05
Sorry, could you elaborate a little? I'm sure you
Ryan Sleevi
2013/09/13 22:14:48
Well, rather than having StreamSocket::CreateSocke
mef
2013/09/16 15:00:08
Hmm, higher level from here is SocketStreamHost an
Ryan Sleevi
2013/09/17 18:53:03
Well, the only implementation that would/should ha
| |
34 &domain_state) && | |
32 domain_state.ShouldUpgradeToSSL()) { | 35 domain_state.ShouldUpgradeToSSL()) { |
33 url_canon::Replacements<char> replacements; | 36 url_canon::Replacements<char> replacements; |
34 static const char kNewScheme[] = "wss"; | 37 static const char kNewScheme[] = "wss"; |
35 replacements.SetScheme(kNewScheme, | 38 replacements.SetScheme(kNewScheme, |
36 url_parse::Component(0, strlen(kNewScheme))); | 39 url_parse::Component(0, strlen(kNewScheme))); |
37 socket_url = url.ReplaceComponents(replacements); | 40 socket_url = url.ReplaceComponents(replacements); |
38 } | 41 } |
39 return SocketStreamJobManager::GetInstance()->CreateJob(socket_url, delegate); | 42 return SocketStreamJobManager::GetInstance()->CreateJob(socket_url, delegate); |
40 } | 43 } |
41 | 44 |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
78 socket_->ContinueDespiteError(); | 81 socket_->ContinueDespiteError(); |
79 } | 82 } |
80 | 83 |
81 void SocketStreamJob::DetachDelegate() { | 84 void SocketStreamJob::DetachDelegate() { |
82 socket_->DetachDelegate(); | 85 socket_->DetachDelegate(); |
83 } | 86 } |
84 | 87 |
85 SocketStreamJob::~SocketStreamJob() {} | 88 SocketStreamJob::~SocketStreamJob() {} |
86 | 89 |
87 } // namespace net | 90 } // namespace net |
OLD | NEW |