| Index: net/http/http_stream_factory.h
|
| diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h
|
| index c3c58dcb44604bdb3871d7f4392184302cbff768..8b748fec8eeef70b35b7920ea463d8a9038bf715 100644
|
| --- a/net/http/http_stream_factory.h
|
| +++ b/net/http/http_stream_factory.h
|
| @@ -66,10 +66,9 @@ class NET_EXPORT_PRIVATE HttpStreamRequest {
|
| // during stream processing.
|
| // |used_proxy_info| indicates the actual ProxyInfo used for this stream,
|
| // since the HttpStreamRequest performs the proxy resolution.
|
| - virtual void OnStreamReady(
|
| - const SSLConfig& used_ssl_config,
|
| - const ProxyInfo& used_proxy_info,
|
| - HttpStreamBase* stream) = 0;
|
| + virtual void OnStreamReady(const SSLConfig& used_ssl_config,
|
| + const ProxyInfo& used_proxy_info,
|
| + HttpStreamBase* stream) = 0;
|
|
|
| // This is the success case for RequestWebSocketHandshakeStream.
|
| // |stream| is now owned by the delegate.
|
| @@ -248,14 +247,10 @@ class NET_EXPORT HttpStreamFactory {
|
| static void set_force_spdy_over_ssl(bool value) {
|
| force_spdy_over_ssl_ = value;
|
| }
|
| - static bool force_spdy_over_ssl() {
|
| - return force_spdy_over_ssl_;
|
| - }
|
| + static bool force_spdy_over_ssl() { return force_spdy_over_ssl_; }
|
|
|
| // Controls whether or not we use spdy without npn.
|
| - static void set_force_spdy_always(bool value) {
|
| - force_spdy_always_ = value;
|
| - }
|
| + static void set_force_spdy_always(bool value) { force_spdy_always_ = value; }
|
| static bool force_spdy_always() { return force_spdy_always_; }
|
|
|
| // Add a URL to exclude from forced SPDY.
|
| @@ -286,9 +281,7 @@ class NET_EXPORT HttpStreamFactory {
|
| // SSL handshake as well as by HTTP Alternate-Protocol.
|
| static void SetNextProtos(const std::vector<NextProto>& value);
|
| static bool has_next_protos() { return next_protos_ != NULL; }
|
| - static const std::vector<std::string>& next_protos() {
|
| - return *next_protos_;
|
| - }
|
| + static const std::vector<std::string>& next_protos() { return *next_protos_; }
|
|
|
| protected:
|
| HttpStreamFactory();
|
|
|