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/web_contents_adapter_p.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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

diff --git a/src/core/web_contents_adapter_p.h b/src/core/web_contents_adapter_p.h
index 5c0e83298..77522d299 100644
--- a/src/core/web_contents_adapter_p.h
+++ b/src/core/web_contents_adapter_p.h
@@ -55,7 +55,6 @@
 
 #include <base/callback.h>
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 
 #include <QScopedPointer>
 #include <QSharedPointer>
@@ -84,10 +83,10 @@ public:
     ~WebContentsAdapterPrivate();
     scoped_refptr<WebEngineContext> engineContext;
     QSharedPointer<BrowserContextAdapter> browserContextAdapter;
-    scoped_ptr<content::WebContents> webContents;
-    scoped_ptr<WebContentsDelegateQt> webContentsDelegate;
-    scoped_ptr<RenderViewObserverHostQt> renderViewObserverHost;
-    scoped_ptr<WebChannelIPCTransportHost> webChannelTransport;
+    std::unique_ptr<content::WebContents> webContents;
+    std::unique_ptr<WebContentsDelegateQt> webContentsDelegate;
+    std::unique_ptr<RenderViewObserverHostQt> renderViewObserverHost;
+    std::unique_ptr<WebChannelIPCTransportHost> webChannelTransport;
     QWebChannel *webChannel;
     unsigned int webChannelWorld;
     WebContentsAdapterClient *adapterClient;
-- 
cgit v1.2.3