Basic porting to Chromium 51

Trivial changes in methods, arguments and types.

Change-Id: Ic707c376249f816268223e696ed5f6251df1f85f
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

4 files changed, 18 insertions, 18 deletions

diff --git a/src/core/renderer/pepper/pepper_host_factory_qt.cpp b/src/core/renderer/pepper/pepper_host_factory_qt.cpp
index 9fbd413ef..a0bab1e51 100644
--- a/src/core/renderer/pepper/pepper_host_factory_qt.cpp
+++ b/src/core/renderer/pepper/pepper_host_factory_qt.cpp
@@ -44,6 +44,7 @@
 
 #include "pepper_host_factory_qt.h"
 
+#include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "ppapi/host/message_filter_host.h"
@@ -68,7 +69,7 @@ PepperHostFactoryQt::PepperHostFactoryQt(content::BrowserPpapiHost* host)
 
 PepperHostFactoryQt::~PepperHostFactoryQt() {}
 
-scoped_ptr<ppapi::host::ResourceHost> PepperHostFactoryQt::CreateResourceHost(ppapi::host::PpapiHost* host,
+std::unique_ptr<ppapi::host::ResourceHost> PepperHostFactoryQt::CreateResourceHost(ppapi::host::PpapiHost* host,
         PP_Resource resource,
         PP_Instance instance,
         const IPC::Message& message)
@@ -77,14 +78,12 @@ scoped_ptr<ppapi::host::ResourceHost> PepperHostFactoryQt::CreateResourceHost(pp
 
 
     if (!host_->IsValidInstance(instance))
-        return scoped_ptr<ppapi::host::ResourceHost>();
+        return nullptr;
 
     if (host_->GetPpapiHost()->permissions().HasPermission(ppapi::PERMISSION_FLASH)
             && message.type() == PpapiHostMsg_Flash_Create::ID)
-        return scoped_ptr<ppapi::host::ResourceHost>(
-                    new PepperFlashBrowserHostQt(host_,
-                                                 instance,
-                                                 resource));
+        return base::WrapUnique(
+            new PepperFlashBrowserHostQt(host_, instance, resource));
 
     // Permissions for the following interfaces will be checked at the
     // time of the corresponding instance's methods calls (because
@@ -95,11 +94,12 @@ scoped_ptr<ppapi::host::ResourceHost> PepperHostFactoryQt::CreateResourceHost(pp
     if (message.type() == PpapiHostMsg_IsolatedFileSystem_Create::ID) {
         PepperIsolatedFileSystemMessageFilter* isolated_fs_filter = PepperIsolatedFileSystemMessageFilter::Create(instance, host_);
         if (!isolated_fs_filter)
-            return scoped_ptr<ResourceHost>();
-        return scoped_ptr<ResourceHost>(new MessageFilterHost(host, instance, resource, isolated_fs_filter));
+            return nullptr;
+        return base::WrapUnique(
+            new MessageFilterHost(host_->GetPpapiHost(), instance, resource, isolated_fs_filter));
     }
 
-    return scoped_ptr<ppapi::host::ResourceHost>();
+    return nullptr;
 }
 
 }  // namespace QtWebEngineCore
diff --git a/src/core/renderer/pepper/pepper_host_factory_qt.h b/src/core/renderer/pepper/pepper_host_factory_qt.h
index e73e097c0..0446cf9e3 100644
--- a/src/core/renderer/pepper/pepper_host_factory_qt.h
+++ b/src/core/renderer/pepper/pepper_host_factory_qt.h
@@ -57,7 +57,7 @@ public:
     explicit PepperHostFactoryQt(content::BrowserPpapiHost* host);
     ~PepperHostFactoryQt() override;
 
-    virtual scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost(
+    virtual std::unique_ptr<ppapi::host::ResourceHost> CreateResourceHost(
             ppapi::host::PpapiHost* host,
             PP_Resource resource,
             PP_Instance instance,
diff --git a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp
index 636ca12f1..89f691cef 100644
--- a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp
+++ b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp
@@ -44,6 +44,8 @@
 
 #include "pepper_renderer_host_factory_qt.h"
 #include "pepper_flash_renderer_host_qt.h"
+
+#include "base/memory/ptr_util.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/host/resource_host.h"
@@ -63,7 +65,7 @@ PepperRendererHostFactoryQt::~PepperRendererHostFactoryQt()
 {
 }
 
-scoped_ptr<ppapi::host::ResourceHost> PepperRendererHostFactoryQt::CreateResourceHost(
+std::unique_ptr<ppapi::host::ResourceHost> PepperRendererHostFactoryQt::CreateResourceHost(
         ppapi::host::PpapiHost* host,
         PP_Resource resource,
         PP_Instance instance,
@@ -72,16 +74,14 @@ scoped_ptr<ppapi::host::ResourceHost> PepperRendererHostFactoryQt::CreateResourc
     DCHECK_EQ(host_->GetPpapiHost(), host);
 
     if (!host_->IsValidInstance(instance))
-        return scoped_ptr<ppapi::host::ResourceHost>();
+        return nullptr;
 
     if (host_->GetPpapiHost()->permissions().HasPermission(ppapi::PERMISSION_FLASH)
             && message.type() == PpapiHostMsg_Flash_Create::ID)
-            return scoped_ptr<ppapi::host::ResourceHost>(
-                        new PepperFlashRendererHostQt(host_,
-                                                      instance,
-                                                      resource));
+            return base::WrapUnique(
+                new PepperFlashRendererHostQt(host_, instance, resource));
 
-    return scoped_ptr<ppapi::host::ResourceHost>();
+    return nullptr;
 }
 
 } // QtWebEngineCore
diff --git a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.h b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.h
index bc472a7c6..ec3440a08 100644
--- a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.h
+++ b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.h
@@ -56,7 +56,7 @@ public:
     ~PepperRendererHostFactoryQt();
 
     // HostFactory.
-    scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost(
+    std::unique_ptr<ppapi::host::ResourceHost> CreateResourceHost(
             ppapi::host::PpapiHost* host,
             PP_Resource resource,
             PP_Instance instance,