Move WebSocketHandleImpl into Blink (take 2)

content/browser/websockets/websocket_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/websockets/websocket_manager.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 35 matching lines @@
     BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, manager_);
     manager_ = nullptr;
   }
 
  private:
   WebSocketManager* manager_;
 };
 
 // static
 void WebSocketManager::CreateWebSocket(int process_id, int frame_id,
-                                       mojom::WebSocketRequest request) {
+                                       blink::mojom::WebSocketRequest request) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   RenderProcessHost* host = RenderProcessHost::FromID(process_id);
   DCHECK(host);
 
   // Maintain a WebSocketManager per RenderProcessHost. While the instance of
   // WebSocketManager is allocated on the UI thread, it must only be used and
   // deleted from the IO thread.
 
   Handle* handle =
@@ skipping 28 matching lines @@
 
 WebSocketManager::~WebSocketManager() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   for (auto impl : impls_) {
     impl->GoAway();
     delete impl;
   }
 }
 
-void WebSocketManager::DoCreateWebSocket(int frame_id,
-                                         mojom::WebSocketRequest request) {
+void WebSocketManager::DoCreateWebSocket(
+    int frame_id,
+    blink::mojom::WebSocketRequest request) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (num_pending_connections_ >= kMaxPendingWebSocketConnections) {
     // Too many websockets! By returning here, we let |request| die, which
     // will be observed by the client as Mojo connection error.
     return;
   }
 
   // Keep all WebSocketImpls alive until either the client drops its
   // connection (see OnLostConnectionToClient) or we need to shutdown.
@@ skipping 33 matching lines @@
 
   if (num_pending_connections_ == 0 &&
       num_previous_failed_connections_ == 0 &&
       num_previous_succeeded_connections_ == 0) {
     throttling_period_timer_.Stop();
   }
 }
 
 WebSocketImpl* WebSocketManager::CreateWebSocketImpl(
     WebSocketImpl::Delegate* delegate,
-    mojom::WebSocketRequest request,
+    blink::mojom::WebSocketRequest request,
     int frame_id,
     base::TimeDelta delay) {
   return new WebSocketImpl(delegate, std::move(request), frame_id, delay);
 }
 
 int WebSocketManager::GetClientProcessId() {
   return process_id_;
 }
 
 StoragePartition* WebSocketManager::GetStoragePartition() {
@@ skipping 15 matching lines @@
     --num_pending_connections_;
     DCHECK_GE(num_pending_connections_, 0);
     ++num_current_failed_connections_;
   }
   impl->GoAway();
   impls_.erase(impl);
   delete impl;
 }
 
 }  // namespace content