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/dev_tools_http_handler_delegate_qt.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/core/dev_tools_http_handler_delegate_qt.cpp')

diff --git a/src/core/dev_tools_http_handler_delegate_qt.cpp b/src/core/dev_tools_http_handler_delegate_qt.cpp
index 0e127d414..5fd35ee29 100644
--- a/src/core/dev_tools_http_handler_delegate_qt.cpp
+++ b/src/core/dev_tools_http_handler_delegate_qt.cpp
@@ -86,10 +86,10 @@ public:
         : m_address(address), m_port(port), m_backlog(backlog)
     {}
 private:
-    scoped_ptr<net::ServerSocket> CreateForHttpServer() override {
-        scoped_ptr<net::ServerSocket> socket(new net::TCPServerSocket(nullptr, net::NetLog::Source()));
+    std::unique_ptr<net::ServerSocket> CreateForHttpServer() override {
+        std::unique_ptr<net::ServerSocket> socket(new net::TCPServerSocket(nullptr, net::NetLog::Source()));
         if (socket->ListenWithAddressAndPort(m_address, m_port, m_backlog) != net::OK)
-            return scoped_ptr<net::ServerSocket>();
+            return std::unique_ptr<net::ServerSocket>();
 
         return socket;
     }
@@ -186,10 +186,10 @@ std::unique_ptr<DevToolsHttpHandler> createDevToolsHttpHandler()
         delete delegate;
         return nullptr;
     }
-    scoped_ptr<DevToolsHttpHandler::ServerSocketFactory> factory(new TCPServerSocketFactory(delegate->bindAddress().toStdString(), delegate->port(), 1));
+    std::unique_ptr<DevToolsHttpHandler::ServerSocketFactory> factory(new TCPServerSocketFactory(delegate->bindAddress().toStdString(), delegate->port(), 1));
     // Ownership of the delegate is taken over the devtools http handler.
     std::unique_ptr<DevToolsHttpHandler> handler(new DevToolsHttpHandler(std::move(factory), std::string(), delegate, base::FilePath(), base::FilePath(), std::string(), std::string()));
-    DevToolsDiscoveryManager::GetInstance()->AddProvider(scoped_ptr<DevToolsDiscoveryManager::Provider>(new DevToolsDiscoveryProviderQt()));
+    DevToolsDiscoveryManager::GetInstance()->AddProvider(base::WrapUnique(new DevToolsDiscoveryProviderQt()));
     return std::move(handler);
 }
 
-- 
cgit v1.2.3