| Index: net/http/http_pipelined_host_test_util.h
|
| diff --git a/net/http/http_pipelined_host_test_util.h b/net/http/http_pipelined_host_test_util.h
|
| index 245ff02c4d58109477f21559a1e1b50a90c164d4..8858ac104c053d9869d97aed8ad0f9168d6a5375 100644
|
| --- a/net/http/http_pipelined_host_test_util.h
|
| +++ b/net/http/http_pipelined_host_test_util.h
|
| @@ -25,15 +25,16 @@ class MockPipelineFactory : public HttpPipelinedConnection::Factory {
|
| MockPipelineFactory();
|
| virtual ~MockPipelineFactory();
|
|
|
| - MOCK_METHOD8(CreateNewPipeline, HttpPipelinedConnection*(
|
| - ClientSocketHandle* connection,
|
| - HttpPipelinedConnection::Delegate* delegate,
|
| - const HostPortPair& origin,
|
| - const SSLConfig& used_ssl_config,
|
| - const ProxyInfo& used_proxy_info,
|
| - const BoundNetLog& net_log,
|
| - bool was_npn_negotiated,
|
| - NextProto protocol_negotiated));
|
| + MOCK_METHOD8(
|
| + CreateNewPipeline,
|
| + HttpPipelinedConnection*(ClientSocketHandle* connection,
|
| + HttpPipelinedConnection::Delegate* delegate,
|
| + const HostPortPair& origin,
|
| + const SSLConfig& used_ssl_config,
|
| + const ProxyInfo& used_proxy_info,
|
| + const BoundNetLog& net_log,
|
| + bool was_npn_negotiated,
|
| + NextProto protocol_negotiated));
|
| };
|
|
|
| class MockPipeline : public HttpPipelinedConnection {
|
| @@ -65,6 +66,8 @@ class MockPipeline : public HttpPipelinedConnection {
|
| bool active_;
|
| };
|
|
|
| -MATCHER_P(MatchesOrigin, expected, "") { return expected.Equals(arg); }
|
| +MATCHER_P(MatchesOrigin, expected, "") {
|
| + return expected.Equals(arg);
|
| +}
|
|
|
| } // namespace net
|
|
|