From baaab31631dcff6075418c95f0220e8fb207dd50 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Fri, 15 Jul 2016 13:16:24 +0200
Subject: Adaptations to Chromium 52
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Idf8a511ba26d263fd9d014d87d5e1101d706da71
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 src/core/proxy_config_service_qt.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/core/proxy_config_service_qt.h')

diff --git a/src/core/proxy_config_service_qt.h b/src/core/proxy_config_service_qt.h
index da24e3337..f2f9a2210 100644
--- a/src/core/proxy_config_service_qt.h
+++ b/src/core/proxy_config_service_qt.h
@@ -41,7 +41,6 @@
 #define PROXY_CONFIG_SERVICE_QT_H
 
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 
 #include "net/proxy/proxy_config.h"
@@ -56,7 +55,7 @@ public:
 
     static net::ProxyServer fromQNetworkProxy(const QNetworkProxy &);
 
-    explicit ProxyConfigServiceQt(scoped_ptr<ProxyConfigService> baseService);
+    explicit ProxyConfigServiceQt(std::unique_ptr<ProxyConfigService> baseService);
     ~ProxyConfigServiceQt() override;
 
     // ProxyConfigService implementation:
@@ -73,7 +72,7 @@ private:
     // Makes sure that the observer registration with the base service is set up.
     void RegisterObserver();
 
-    scoped_ptr<net::ProxyConfigService> m_baseService;
+    std::unique_ptr<net::ProxyConfigService> m_baseService;
     base::ObserverList<net::ProxyConfigService::Observer, true> m_observers;
 
     // Keep the last QNetworkProxy::applicationProxy state around.
-- 
cgit v1.2.3