| Index: net/http/http_stream_factory.cc
|
| diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc
|
| index e16c9f0568ff42d287bc33bc346ab8a6473ea4cd..c2c9be80a9ac1c90c653bb72228f282ec8770a89 100644
|
| --- a/net/http/http_stream_factory.cc
|
| +++ b/net/http/http_stream_factory.cc
|
| @@ -31,26 +31,28 @@ bool HttpStreamFactory::force_spdy_always_ = false;
|
| // static
|
| std::list<HostPortPair>* HttpStreamFactory::forced_spdy_exclusions_ = NULL;
|
|
|
| -HttpStreamFactory::~HttpStreamFactory() {}
|
| +HttpStreamFactory::~HttpStreamFactory() {
|
| +}
|
|
|
| // static
|
| bool HttpStreamFactory::IsProtocolEnabled(AlternateProtocol protocol) {
|
| DCHECK(IsAlternateProtocolValid(protocol));
|
| - return enabled_protocols_[
|
| - protocol - ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION];
|
| + return enabled_protocols_[protocol -
|
| + ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION];
|
| }
|
|
|
| // static
|
| void HttpStreamFactory::SetProtocolEnabled(AlternateProtocol protocol) {
|
| DCHECK(IsAlternateProtocolValid(protocol));
|
| - enabled_protocols_[
|
| - protocol - ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION] = true;
|
| + enabled_protocols_[protocol - ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION] =
|
| + true;
|
| }
|
|
|
| // static
|
| void HttpStreamFactory::ResetEnabledProtocols() {
|
| for (int i = ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION;
|
| - i <= ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION; ++i) {
|
| + i <= ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION;
|
| + ++i) {
|
| enabled_protocols_[i - ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION] = false;
|
| }
|
| }
|
| @@ -77,17 +79,15 @@ void HttpStreamFactory::ProcessAlternateProtocol(
|
| base::SplitString(alternate_protocol_str, ':', &port_protocol_vector);
|
| if (port_protocol_vector.size() != 2) {
|
| DVLOG(1) << kAlternateProtocolHeader
|
| - << " header has too many tokens: "
|
| - << alternate_protocol_str;
|
| + << " header has too many tokens: " << alternate_protocol_str;
|
| return;
|
| }
|
|
|
| int port;
|
| - if (!base::StringToInt(port_protocol_vector[0], &port) ||
|
| - port <= 0 || port >= 1 << 16) {
|
| + if (!base::StringToInt(port_protocol_vector[0], &port) || port <= 0 ||
|
| + port >= 1 << 16) {
|
| DVLOG(1) << kAlternateProtocolHeader
|
| - << " header has unrecognizable port: "
|
| - << port_protocol_vector[0];
|
| + << " header has unrecognizable port: " << port_protocol_vector[0];
|
| return;
|
| }
|
|
|
| @@ -242,6 +242,7 @@ void HttpStreamFactory::SetNextProtos(const std::vector<NextProto>& value) {
|
| }
|
| }
|
|
|
| -HttpStreamFactory::HttpStreamFactory() {}
|
| +HttpStreamFactory::HttpStreamFactory() {
|
| +}
|
|
|
| } // namespace net
|
|
|