| Index: net/http/http_stream_factory_impl_request_unittest.cc
|
| diff --git a/net/http/http_stream_factory_impl_request_unittest.cc b/net/http/http_stream_factory_impl_request_unittest.cc
|
| index 14c06ef71076e9f2f2cc4cbf3c1028bad8c39f06..317c416a0296d8d5a40ac449f60a616ddd42c05a 100644
|
| --- a/net/http/http_stream_factory_impl_request_unittest.cc
|
| +++ b/net/http/http_stream_factory_impl_request_unittest.cc
|
| @@ -16,11 +16,12 @@ class HttpStreamFactoryImplRequestTest
|
| : public ::testing::Test,
|
| public ::testing::WithParamInterface<NextProto> {};
|
|
|
| -INSTANTIATE_TEST_CASE_P(
|
| - NextProto,
|
| - HttpStreamFactoryImplRequestTest,
|
| - testing::Values(kProtoDeprecatedSPDY2,
|
| - kProtoSPDY3, kProtoSPDY31, kProtoSPDY4));
|
| +INSTANTIATE_TEST_CASE_P(NextProto,
|
| + HttpStreamFactoryImplRequestTest,
|
| + testing::Values(kProtoDeprecatedSPDY2,
|
| + kProtoSPDY3,
|
| + kProtoSPDY31,
|
| + kProtoSPDY4));
|
|
|
| namespace {
|
|
|
| @@ -31,21 +32,18 @@ class DoNothingRequestDelegate : public HttpStreamRequest::Delegate {
|
| virtual ~DoNothingRequestDelegate() {}
|
|
|
| // HttpStreamRequest::Delegate
|
| - virtual void OnStreamReady(
|
| - const SSLConfig& used_ssl_config,
|
| - const ProxyInfo& used_proxy_info,
|
| - HttpStreamBase* stream) OVERRIDE {}
|
| + virtual void OnStreamReady(const SSLConfig& used_ssl_config,
|
| + const ProxyInfo& used_proxy_info,
|
| + HttpStreamBase* stream) OVERRIDE {}
|
| virtual void OnWebSocketHandshakeStreamReady(
|
| const SSLConfig& used_ssl_config,
|
| const ProxyInfo& used_proxy_info,
|
| WebSocketHandshakeStreamBase* stream) OVERRIDE {}
|
| - virtual void OnStreamFailed(
|
| - int status,
|
| - const SSLConfig& used_ssl_config) OVERRIDE {}
|
| - virtual void OnCertificateError(
|
| - int status,
|
| - const SSLConfig& used_ssl_config,
|
| - const SSLInfo& ssl_info) OVERRIDE {}
|
| + virtual void OnStreamFailed(int status,
|
| + const SSLConfig& used_ssl_config) OVERRIDE {}
|
| + virtual void OnCertificateError(int status,
|
| + const SSLConfig& used_ssl_config,
|
| + const SSLInfo& ssl_info) OVERRIDE {}
|
| virtual void OnNeedsProxyAuth(const HttpResponseInfo& proxy_response,
|
| const SSLConfig& used_ssl_config,
|
| const ProxyInfo& used_proxy_info,
|
| @@ -65,8 +63,8 @@ TEST_P(HttpStreamFactoryImplRequestTest, SetPriority) {
|
| SpdySessionDependencies session_deps(GetParam(),
|
| ProxyService::CreateDirect());
|
|
|
| - scoped_refptr<HttpNetworkSession>
|
| - session(SpdySessionDependencies::SpdyCreateSession(&session_deps));
|
| + scoped_refptr<HttpNetworkSession> session(
|
| + SpdySessionDependencies::SpdyCreateSession(&session_deps));
|
| HttpStreamFactoryImpl* factory =
|
| static_cast<HttpStreamFactoryImpl*>(session->http_stream_factory());
|
|
|
|
|