From 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Thu, 14 Jul 2016 17:41:05 +0200
Subject: BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 chromium/net/socket/mock_client_socket_pool_manager.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'chromium/net/socket/mock_client_socket_pool_manager.h')

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_;
-- 
cgit v1.2.1