webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 6 insertions, 6 deletions

diff --git a/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp b/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp
index 1e2390d0c..36b9bf06f 100644
--- a/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp
+++ b/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp
@@ -27,14 +27,14 @@
 #include "WKType.h"
 #include "WebKitWebExtensionPrivate.h"
 #include <WebCore/FileSystem.h>
-#include <wtf/OwnPtr.h>
+#include <memory>
 #include <wtf/text/CString.h>
 
 namespace WebKit {
 
-WebGtkExtensionManager& WebGtkExtensionManager::shared()
+WebGtkExtensionManager& WebGtkExtensionManager::singleton()
 {
-    DEFINE_STATIC_LOCAL(WebGtkExtensionManager, extensionManager, ());
+    static NeverDestroyed<WebGtkExtensionManager> extensionManager;
     return extensionManager;
 }
 
@@ -67,7 +67,7 @@ static void parseUserData(WKTypeRef userData, String& webExtensionsDirectory, GR
     GVariant* data = nullptr;
     g_variant_get(variant.get(), "(m&smv)", &directory, &data);
 
-    webExtensionsDirectory = WebCore::filenameToString(directory);
+    webExtensionsDirectory = WebCore::stringFromFileSystemRepresentation(directory);
     initializationUserData = adoptGRef(data);
 }
 
@@ -105,11 +105,11 @@ void WebGtkExtensionManager::initialize(WKBundleRef bundle, WKTypeRef userDataSt
     scanModules(webExtensionsDirectory, modulePaths);
 
     for (size_t i = 0; i < modulePaths.size(); ++i) {
-        OwnPtr<Module> module = adoptPtr(new Module(modulePaths[i]));
+        auto module = std::make_unique<Module>(modulePaths[i]);
         if (!module->load())
             continue;
         if (initializeWebExtension(module.get(), userData.get()))
-            m_extensionModules.append(module.leakPtr());
+            m_extensionModules.append(module.release());
     }
 }