| Index: net/http/http_network_transaction.h
|
| diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h
|
| index 24ab95b8ac21e67d6b00ea0f1c69bd368c3abba0..f086585b522f22ac49b269fd0ca6eaa13b47fc73 100644
|
| --- a/net/http/http_network_transaction.h
|
| +++ b/net/http/http_network_transaction.h
|
| @@ -38,8 +38,7 @@ class NET_EXPORT_PRIVATE HttpNetworkTransaction
|
| : public HttpTransaction,
|
| public HttpStreamRequest::Delegate {
|
| public:
|
| - HttpNetworkTransaction(RequestPriority priority,
|
| - HttpNetworkSession* session);
|
| + HttpNetworkTransaction(RequestPriority priority, HttpNetworkSession* session);
|
|
|
| virtual ~HttpNetworkTransaction();
|
|
|
| @@ -90,11 +89,10 @@ class NET_EXPORT_PRIVATE HttpNetworkTransaction
|
| virtual void OnCertificateError(int status,
|
| const SSLConfig& used_ssl_config,
|
| const SSLInfo& ssl_info) OVERRIDE;
|
| - virtual void OnNeedsProxyAuth(
|
| - const HttpResponseInfo& response_info,
|
| - const SSLConfig& used_ssl_config,
|
| - const ProxyInfo& used_proxy_info,
|
| - HttpAuthController* auth_controller) OVERRIDE;
|
| + virtual void OnNeedsProxyAuth(const HttpResponseInfo& response_info,
|
| + const SSLConfig& used_ssl_config,
|
| + const ProxyInfo& used_proxy_info,
|
| + HttpAuthController* auth_controller) OVERRIDE;
|
| virtual void OnNeedsClientAuth(const SSLConfig& used_ssl_config,
|
| SSLCertRequestInfo* cert_info) OVERRIDE;
|
| virtual void OnHttpsProxyTunnelResponse(const HttpResponseInfo& response_info,
|
| @@ -105,16 +103,11 @@ class NET_EXPORT_PRIVATE HttpNetworkTransaction
|
| private:
|
| friend class HttpNetworkTransactionSSLTest;
|
|
|
| - FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionTest,
|
| - ResetStateForRestart);
|
| - FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest,
|
| - WindowUpdateReceived);
|
| - FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest,
|
| - WindowUpdateSent);
|
| - FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest,
|
| - WindowUpdateOverflow);
|
| - FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest,
|
| - FlowControlStallResume);
|
| + FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionTest, ResetStateForRestart);
|
| + FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, WindowUpdateReceived);
|
| + FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, WindowUpdateSent);
|
| + FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, WindowUpdateOverflow);
|
| + FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, FlowControlStallResume);
|
| FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest,
|
| FlowControlStallResumeAfterSettings);
|
| FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest,
|
|
|