diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/net/http/http_network_transaction.h | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
| download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/net/http/http_network_transaction.h')
| -rw-r--r-- | chromium/net/http/http_network_transaction.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/chromium/net/http/http_network_transaction.h b/chromium/net/http/http_network_transaction.h index e819963ac80..ea02de6957c 100644 --- a/chromium/net/http/http_network_transaction.h +++ b/chromium/net/http/http_network_transaction.h @@ -62,8 +62,8 @@ class NET_EXPORT_PRIVATE HttpNetworkTransaction const CompletionCallback& callback, const NetLogWithSource& net_log) override; int RestartIgnoringLastError(const CompletionCallback& callback) override; - int RestartWithCertificate(X509Certificate* client_cert, - SSLPrivateKey* client_private_key, + int RestartWithCertificate(scoped_refptr<X509Certificate> client_cert, + scoped_refptr<SSLPrivateKey> client_private_key, const CompletionCallback& callback) override; int RestartWithAuth(const AuthCredentials& credentials, const CompletionCallback& callback) override; @@ -95,14 +95,15 @@ class NET_EXPORT_PRIVATE HttpNetworkTransaction // HttpStreamRequest::Delegate methods: void OnStreamReady(const SSLConfig& used_ssl_config, const ProxyInfo& used_proxy_info, - HttpStream* stream) override; - void OnBidirectionalStreamImplReady(const SSLConfig& used_ssl_config, - const ProxyInfo& used_proxy_info, - BidirectionalStreamImpl* stream) override; + std::unique_ptr<HttpStream> stream) override; + void OnBidirectionalStreamImplReady( + const SSLConfig& used_ssl_config, + const ProxyInfo& used_proxy_info, + std::unique_ptr<BidirectionalStreamImpl> stream) override; void OnWebSocketHandshakeStreamReady( const SSLConfig& used_ssl_config, const ProxyInfo& used_proxy_info, - WebSocketHandshakeStreamBase* stream) override; + std::unique_ptr<WebSocketHandshakeStreamBase> stream) override; void OnStreamFailed(int status, const SSLConfig& used_ssl_config) override; void OnCertificateError(int status, const SSLConfig& used_ssl_config, |