diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/net/socket/mock_client_socket_pool_manager.h | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/socket/mock_client_socket_pool_manager.h')
| -rw-r--r-- | chromium/net/socket/mock_client_socket_pool_manager.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/net/socket/mock_client_socket_pool_manager.h b/chromium/net/socket/mock_client_socket_pool_manager.h index e24b2fb3ae6..919ef32f3aa 100644 --- a/chromium/net/socket/mock_client_socket_pool_manager.h +++ b/chromium/net/socket/mock_client_socket_pool_manager.h @@ -37,7 +37,7 @@ class MockClientSocketPoolManager : public ClientSocketPoolManager { const HostPortPair& http_proxy) override; SSLClientSocketPool* GetSocketPoolForSSLWithProxy( const HostPortPair& proxy_server) override; - scoped_ptr<base::Value> SocketPoolInfoToValue() const override; + std::unique_ptr<base::Value> SocketPoolInfoToValue() const override; private: typedef internal::OwnedPoolMap<HostPortPair, TransportClientSocketPool*> @@ -49,8 +49,8 @@ class MockClientSocketPoolManager : public ClientSocketPoolManager { typedef internal::OwnedPoolMap<HostPortPair, SSLClientSocketPool*> SSLSocketPoolMap; - scoped_ptr<TransportClientSocketPool> transport_socket_pool_; - scoped_ptr<SSLClientSocketPool> ssl_socket_pool_; + std::unique_ptr<TransportClientSocketPool> transport_socket_pool_; + std::unique_ptr<SSLClientSocketPool> ssl_socket_pool_; SOCKSSocketPoolMap socks_socket_pools_; HTTPProxySocketPoolMap http_proxy_socket_pools_; SSLSocketPoolMap ssl_socket_pools_for_proxies_; |