webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 5 insertions, 6 deletions

diff --git a/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp b/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
index f3ad13ac2..bf3e019e6 100644
--- a/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
+++ b/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
@@ -28,11 +28,10 @@
 
 #include "Logging.h"
 #include "WebSocketServerConnection.h"
-#include <WebCore/SocketStreamHandle.h>
+#include <WebCore/SocketStreamHandleImpl.h>
 #include <gio/gio.h>
 #include <glib.h>
-#include <wtf/PassOwnPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebCore;
@@ -47,9 +46,9 @@ static gboolean connectionCallback(GSocketService* /*service*/, GSocketConnectio
     LOG(InspectorServer, "New Connection from %s:%d.", addressString.get(), g_inet_socket_address_get_port(G_INET_SOCKET_ADDRESS(socketAddress.get())));
 #endif
 
-    OwnPtr<WebSocketServerConnection> webSocketConnection = adoptPtr(new WebSocketServerConnection(server->client(), server));
-    webSocketConnection->setSocketHandle(SocketStreamHandle::create(connection, webSocketConnection.get()));
-    server->didAcceptConnection(webSocketConnection.release());
+    auto webSocketConnection = std::make_unique<WebSocketServerConnection>(server->client(), server);
+    webSocketConnection->setSocketHandle(SocketStreamHandleImpl::create(connection, *webSocketConnection));
+    server->didAcceptConnection(WTFMove(webSocketConnection));
 
     return TRUE;
 }