Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 4 insertions, 5 deletions

diff --git a/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.cpp b/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.cpp
index cf4ee1305..fd8a930a5 100644
--- a/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.cpp
+++ b/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.cpp
@@ -32,7 +32,6 @@
 
 #include "WebSocketServerConnection.h"
 #include <WebCore/SocketStreamHandle.h>
-#include <wtf/PassOwnPtr.h>
 
 #if PLATFORM(QT)
 #include "WebSocketServerQt.h"
@@ -82,20 +81,20 @@ void WebSocketServer::close()
     m_bindAddress = String();
 }
 
-void WebSocketServer::didAcceptConnection(PassOwnPtr<WebSocketServerConnection> connection)
+void WebSocketServer::didAcceptConnection(std::unique_ptr<WebSocketServerConnection> connection)
 {
-    m_connections.append(connection);
+    m_connections.append(WTFMove(connection));
 }
 
 void WebSocketServer::didCloseWebSocketServerConnection(WebSocketServerConnection* connection)
 {
-    Deque<OwnPtr<WebSocketServerConnection> >::iterator end = m_connections.end();
-    for (Deque<OwnPtr<WebSocketServerConnection> >::iterator it = m_connections.begin(); it != end; ++it) {
+    for (auto it = m_connections.begin(), end = m_connections.end(); it != end; ++it) {
         if (it->get() == connection) {
             m_connections.remove(it);
             return;
         }
     }
+
     ASSERT_NOT_REACHED();
 }