| Index: net/socket_stream/socket_stream_job.cc
|
| diff --git a/net/socket_stream/socket_stream_job.cc b/net/socket_stream/socket_stream_job.cc
|
| index 0bd702686bd7db13b437e04f0e73f1b9973911fc..0ca96bf6219deb927f17eeb12ef113306780922b 100644
|
| --- a/net/socket_stream/socket_stream_job.cc
|
| +++ b/net/socket_stream/socket_stream_job.cc
|
| @@ -14,7 +14,8 @@ namespace net {
|
|
|
| // static
|
| SocketStreamJob::ProtocolFactory* SocketStreamJob::RegisterProtocolFactory(
|
| - const std::string& scheme, ProtocolFactory* factory) {
|
| + const std::string& scheme,
|
| + ProtocolFactory* factory) {
|
| return SocketStreamJobManager::GetInstance()->RegisterProtocolFactory(
|
| scheme, factory);
|
| }
|
| @@ -29,7 +30,8 @@ SocketStreamJob* SocketStreamJob::CreateSocketStreamJob(
|
| CookieStore* cookie_store) {
|
| GURL socket_url(url);
|
| TransportSecurityState::DomainState domain_state;
|
| - if (url.scheme() == "ws" && sts && sts->GetDomainState(
|
| + if (url.scheme() == "ws" && sts &&
|
| + sts->GetDomainState(
|
| url.host(), SSLConfigService::IsSNIAvailable(ssl), &domain_state) &&
|
| domain_state.ShouldUpgradeToSSL()) {
|
| url::Replacements<char> replacements;
|
| @@ -41,7 +43,8 @@ SocketStreamJob* SocketStreamJob::CreateSocketStreamJob(
|
| socket_url, delegate, context, cookie_store);
|
| }
|
|
|
| -SocketStreamJob::SocketStreamJob() {}
|
| +SocketStreamJob::SocketStreamJob() {
|
| +}
|
|
|
| SocketStream::UserData* SocketStreamJob::GetUserData(const void* key) const {
|
| return socket_->GetUserData(key);
|
| @@ -89,6 +92,7 @@ void SocketStreamJob::DetachContext() {
|
| socket_->DetachContext();
|
| }
|
|
|
| -SocketStreamJob::~SocketStreamJob() {}
|
| +SocketStreamJob::~SocketStreamJob() {
|
| +}
|
|
|
| } // namespace net
|
|
|