| Index: net/socket_stream/socket_stream.cc
|
| diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
|
| index 5979dd19c9288cf8e9b5d76bbe79f0930ed56b77..c5de6ceb726ce82d872e03b84ccc3a7e84366741 100644
|
| --- a/net/socket_stream/socket_stream.cc
|
| +++ b/net/socket_stream/socket_stream.cc
|
| @@ -50,7 +50,8 @@ static const int kReadBufferSize = 4096;
|
| namespace net {
|
|
|
| int SocketStream::Delegate::OnStartOpenConnection(
|
| - SocketStream* socket, const CompletionCallback& callback) {
|
| + SocketStream* socket,
|
| + const CompletionCallback& callback) {
|
| return OK;
|
| }
|
|
|
| @@ -60,10 +61,9 @@ void SocketStream::Delegate::OnAuthRequired(SocketStream* socket,
|
| socket->Close();
|
| }
|
|
|
| -void SocketStream::Delegate::OnSSLCertificateError(
|
| - SocketStream* socket,
|
| - const SSLInfo& ssl_info,
|
| - bool fatal) {
|
| +void SocketStream::Delegate::OnSSLCertificateError(SocketStream* socket,
|
| + const SSLInfo& ssl_info,
|
| + bool fatal) {
|
| socket->CancelWithSSLError(ssl_info);
|
| }
|
|
|
| @@ -79,15 +79,19 @@ bool SocketStream::Delegate::CanSetCookie(SocketStream* request,
|
| return true;
|
| }
|
|
|
| -SocketStream::ResponseHeaders::ResponseHeaders() : IOBuffer() {}
|
| +SocketStream::ResponseHeaders::ResponseHeaders() : IOBuffer() {
|
| +}
|
|
|
| void SocketStream::ResponseHeaders::Realloc(size_t new_size) {
|
| headers_.reset(static_cast<char*>(realloc(headers_.release(), new_size)));
|
| }
|
|
|
| -SocketStream::ResponseHeaders::~ResponseHeaders() { data_ = NULL; }
|
| +SocketStream::ResponseHeaders::~ResponseHeaders() {
|
| + data_ = NULL;
|
| +}
|
|
|
| -SocketStream::SocketStream(const GURL& url, Delegate* delegate,
|
| +SocketStream::SocketStream(const GURL& url,
|
| + Delegate* delegate,
|
| URLRequestContext* context,
|
| CookieStore* cookie_store)
|
| : delegate_(delegate),
|
| @@ -103,8 +107,8 @@ SocketStream::SocketStream(const GURL& url, Delegate* delegate,
|
| privacy_mode_(PRIVACY_MODE_DISABLED),
|
| // Unretained() is required; without it, Bind() creates a circular
|
| // dependency and the SocketStream object will not be freed.
|
| - io_callback_(base::Bind(&SocketStream::OnIOCompleted,
|
| - base::Unretained(this))),
|
| + io_callback_(
|
| + base::Bind(&SocketStream::OnIOCompleted, base::Unretained(this))),
|
| read_buf_(NULL),
|
| current_write_buf_(NULL),
|
| waiting_for_write_completion_(false),
|
| @@ -122,16 +126,14 @@ SocketStream::SocketStream(const GURL& url, Delegate* delegate,
|
| if (!cookie_store_)
|
| cookie_store_ = context_->cookie_store();
|
|
|
| - net_log_ = BoundNetLog::Make(
|
| - context->net_log(),
|
| - NetLog::SOURCE_SOCKET_STREAM);
|
| + net_log_ =
|
| + BoundNetLog::Make(context->net_log(), NetLog::SOURCE_SOCKET_STREAM);
|
|
|
| net_log_.BeginEvent(NetLog::TYPE_REQUEST_ALIVE);
|
| }
|
| }
|
|
|
| -SocketStream::UserData* SocketStream::GetUserData(
|
| - const void* key) const {
|
| +SocketStream::UserData* SocketStream::GetUserData(const void* key) const {
|
| UserDataMap::const_iterator found = user_data_.find(key);
|
| if (found != user_data_.end())
|
| return found->second.get();
|
| @@ -164,8 +166,8 @@ void SocketStream::DetachContext() {
|
|
|
| void SocketStream::CheckPrivacyMode() {
|
| if (context_ && context_->network_delegate()) {
|
| - bool enable = context_->network_delegate()->CanEnablePrivacyMode(url_,
|
| - url_);
|
| + bool enable =
|
| + context_->network_delegate()->CanEnablePrivacyMode(url_, url_);
|
| privacy_mode_ = enable ? PRIVACY_MODE_ENABLED : PRIVACY_MODE_DISABLED;
|
| // Disable Channel ID if privacy mode is enabled.
|
| if (enable)
|
| @@ -213,8 +215,8 @@ bool SocketStream::SendData(const char* data, int len) {
|
| << "The current base::MessageLoop must be TYPE_IO";
|
| DCHECK_GT(len, 0);
|
|
|
| - if (!connection_->socket() ||
|
| - !connection_->socket()->IsConnected() || next_state_ == STATE_NONE) {
|
| + if (!connection_->socket() || !connection_->socket()->IsConnected() ||
|
| + next_state_ == STATE_NONE) {
|
| return false;
|
| }
|
|
|
| @@ -233,8 +235,7 @@ bool SocketStream::SendData(const char* data, int len) {
|
|
|
| // TODO(tyoshino): Split data into smaller chunks e.g. 8KiB to free consumed
|
| // buffer progressively
|
| - pending_write_bufs_.push_back(make_scoped_refptr(
|
| - new IOBufferWithSize(len)));
|
| + pending_write_bufs_.push_back(make_scoped_refptr(new IOBufferWithSize(len)));
|
| memcpy(pending_write_bufs_.back()->data(), data, len);
|
|
|
| // If current_write_buf_ is not NULL, it means that a) there's ongoing write
|
| @@ -303,8 +304,7 @@ const ProxyServer& SocketStream::proxy_server() const {
|
| return proxy_info_.proxy_server();
|
| }
|
|
|
| -void SocketStream::SetClientSocketFactory(
|
| - ClientSocketFactory* factory) {
|
| +void SocketStream::SetClientSocketFactory(ClientSocketFactory* factory) {
|
| DCHECK(factory);
|
| factory_ = factory;
|
| }
|
| @@ -329,7 +329,9 @@ SocketStream::~SocketStream() {
|
| DCHECK(!pac_request_);
|
| }
|
|
|
| -SocketStream::RequestHeaders::~RequestHeaders() { data_ = NULL; }
|
| +SocketStream::RequestHeaders::~RequestHeaders() {
|
| + data_ = NULL;
|
| +}
|
|
|
| void SocketStream::set_addresses(const AddressList& addresses) {
|
| addresses_ = addresses;
|
| @@ -581,8 +583,8 @@ void SocketStream::DoLoop(int result) {
|
| // If the connection is not established yet and had actual errors,
|
| // record the error. In next iteration, it will close the connection.
|
| if (state != STATE_READ_WRITE && result < ERR_IO_PENDING) {
|
| - net_log_.EndEventWithNetErrorCode(
|
| - NetLog::TYPE_SOCKET_STREAM_CONNECT, result);
|
| + net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SOCKET_STREAM_CONNECT,
|
| + result);
|
| }
|
| } while (result != ERR_IO_PENDING);
|
| }
|
| @@ -728,8 +730,7 @@ int SocketStream::DoResolveProtocolComplete(int result) {
|
|
|
| if (result == ERR_PROTOCOL_SWITCHED) {
|
| next_state_ = STATE_CLOSE;
|
| - metrics_->OnCountWireProtocolType(
|
| - SocketStreamMetrics::WIRE_PROTOCOL_SPDY);
|
| + metrics_->OnCountWireProtocolType(SocketStreamMetrics::WIRE_PROTOCOL_SPDY);
|
| } else if (result == OK) {
|
| next_state_ = STATE_TCP_CONNECT;
|
| metrics_->OnCountWireProtocolType(
|
| @@ -747,10 +748,8 @@ int SocketStream::DoTcpConnect(int result) {
|
| }
|
| next_state_ = STATE_TCP_CONNECT_COMPLETE;
|
| DCHECK(factory_);
|
| - connection_->SetSocket(
|
| - factory_->CreateTransportClientSocket(addresses_,
|
| - net_log_.net_log(),
|
| - net_log_.source()));
|
| + connection_->SetSocket(factory_->CreateTransportClientSocket(
|
| + addresses_, net_log_.net_log(), net_log_.source()));
|
| metrics_->OnStartConnection();
|
| return connection_->socket()->Connect(io_callback_);
|
| }
|
| @@ -876,8 +875,8 @@ int SocketStream::DoReadTunnelHeaders() {
|
| tunnel_response_headers_len_ = 0;
|
| }
|
|
|
| - int buf_len = tunnel_response_headers_capacity_ -
|
| - tunnel_response_headers_len_;
|
| + int buf_len =
|
| + tunnel_response_headers_capacity_ - tunnel_response_headers_len_;
|
| tunnel_response_headers_->SetDataOffset(tunnel_response_headers_len_);
|
| CHECK(tunnel_response_headers_->data());
|
|
|
| @@ -934,9 +933,9 @@ int SocketStream::DoReadTunnelHeadersComplete(int result) {
|
| return result;
|
| }
|
| if ((eoh < tunnel_response_headers_len_) && delegate_)
|
| - delegate_->OnReceivedData(
|
| - this, tunnel_response_headers_->headers() + eoh,
|
| - tunnel_response_headers_len_ - eoh);
|
| + delegate_->OnReceivedData(this,
|
| + tunnel_response_headers_->headers() + eoh,
|
| + tunnel_response_headers_len_ - eoh);
|
| }
|
| return OK;
|
| case 407: // Proxy Authentication Required.
|
| @@ -1338,8 +1337,10 @@ int SocketStream::HandleCertificateError(int result) {
|
| ssl_socket->GetSSLInfo(&ssl_info);
|
|
|
| TransportSecurityState::DomainState domain_state;
|
| - const bool fatal = context_->transport_security_state() &&
|
| - context_->transport_security_state()->GetDomainState(url_.host(),
|
| + const bool fatal =
|
| + context_->transport_security_state() &&
|
| + context_->transport_security_state()->GetDomainState(
|
| + url_.host(),
|
| SSLConfigService::IsSNIAvailable(context_->ssl_config_service()),
|
| &domain_state) &&
|
| domain_state.ShouldSSLErrorsBeFatal();
|
|
|