WebSocket: Clean up WebSocket creation

This is just a cleanup and doesn't change behavior.

Bug: 825740
Change-Id: I36c4002ca29bd3ad5af1a8f63ef2b33e6b977981
Reviewed-on: https://chromium-review.googlesource.com/1027370Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553485}

content/browser/frame_host/render_frame_host_impl.cc

@@ -4581,21 +4581,11 @@ void RenderFrameHostImpl::BindMediaInterfaceFactoryRequest(
 
 void RenderFrameHostImpl::CreateWebSocket(
     network::mojom::WebSocketRequest request) {
-  if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
-    auto* context = GetSiteInstance()->GetBrowserContext();
-    auto* storage_partition = static_cast<StoragePartitionImpl*>(
-        BrowserContext::GetStoragePartition(context, GetSiteInstance()));
-    storage_partition->GetNetworkContext()->CreateWebSocket(
-        std::move(request), process_->GetID(), routing_id_,
-        last_committed_origin_);
-  } else {
-    // This is to support usage of WebSockets in cases in which there is an
-    // associated RenderFrame. This is important for showing the correct
-    // security state of the page and also honoring user override of bad
-    // certificates.
-    WebSocketManager::CreateWebSocketForFrame(process_->GetID(), routing_id_,
-                                              std::move(request));
-  }
+  // This is to support usage of WebSockets in cases in which there is an
+  // associated RenderFrame. This is important for showing the correct security
+  // state of the page and also honoring user override of bad certificates.
+  WebSocketManager::CreateWebSocket(process_->GetID(), routing_id_,
+                                    last_committed_origin_, std::move(request));
 }
 
 void RenderFrameHostImpl::OnMediaInterfaceFactoryConnectionError() {

content/browser/frame_host/render_frame_host_impl.h

@@ -1195,7 +1195,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
   // RenderFrameHost owns its RenderViewHost.
   RenderWidgetHostImpl* render_widget_host_;
 
-  int routing_id_;
+  const int routing_id_;
 
   // Boolean indicating whether this RenderFrameHost is being actively used or
   // is waiting for FrameHostMsg_SwapOut_ACK and thus pending deletion.

content/browser/renderer_interface_binders.cc

@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "base/feature_list.h"
 #include "content/browser/background_fetch/background_fetch_service_impl.h"
 #include "content/browser/dedicated_worker/dedicated_worker_host.h"
 #include "content/browser/locks/lock_manager.h"
@@ -26,7 +25,6 @@
 #include "content/public/common/content_switches.h"
 #include "services/device/public/mojom/constants.mojom.h"
 #include "services/device/public/mojom/vibration_manager.mojom.h"
-#include "services/network/public/cpp/features.h"
 #include "services/network/restricted_cookie_manager.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/connector.h"
@@ -187,16 +185,8 @@ void RendererInterfaceBinders::CreateWebSocket(
     network::mojom::WebSocketRequest request,
     RenderProcessHost* host,
     const url::Origin& origin) {
-  if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
-    StoragePartition* storage_partition = host->GetStoragePartition();
-    network::mojom::NetworkContext* network_context =
-        storage_partition->GetNetworkContext();
-    network_context->CreateWebSocket(std::move(request), host->GetID(),
-                                     MSG_ROUTING_NONE, origin);
-  } else {
-    WebSocketManager::CreateWebSocketWithOrigin(
-        host->GetID(), origin, std::move(request), MSG_ROUTING_NONE);
-  }
+  WebSocketManager::CreateWebSocket(host->GetID(), MSG_ROUTING_NONE, origin,
+                                    std::move(request));
 }
 
 }  // namespace

content/browser/websockets/websocket_manager.cc

@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/callback.h"
+#include "base/feature_list.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
@@ -23,6 +24,8 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_process_host_observer.h"
 #include "content/public/browser/storage_partition.h"
+#include "services/network/network_context.h"
+#include "services/network/public/cpp/features.h"
 
 namespace content {
 
@@ -157,31 +160,25 @@ class WebSocketManager::Handle : public base::SupportsUserData::Data,
 };
 
 // static
-void WebSocketManager::CreateWebSocketForFrame(
+void WebSocketManager::CreateWebSocket(
     int process_id,
     int frame_id,
-    network::mojom::WebSocketRequest request) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  // ForFrame() implies a frame: DCHECK this pre-condition.
-  RenderFrameHost* frame = RenderFrameHost::FromID(process_id, frame_id);
-  DCHECK(frame);
-
-  CreateWebSocketWithOrigin(process_id, frame->GetLastCommittedOrigin(),
-                            std::move(request), frame_id);
-}
-
-// static
-void WebSocketManager::CreateWebSocketWithOrigin(
-    int process_id,
     url::Origin origin,
-    network::mojom::WebSocketRequest request,
-    int frame_id) {
+    network::mojom::WebSocketRequest request) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   RenderProcessHost* host = RenderProcessHost::FromID(process_id);
   DCHECK(host);
 
+  if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
+    StoragePartition* storage_partition = host->GetStoragePartition();
+    network::mojom::NetworkContext* network_context =
+        storage_partition->GetNetworkContext();
+    network_context->CreateWebSocket(std::move(request), process_id, frame_id,
+                                     origin);
+    return;
+  }
+
   // 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.

content/browser/websockets/websocket_manager.h

@@ -29,18 +29,15 @@ class StoragePartition;
 class CONTENT_EXPORT WebSocketManager
     : public net::URLRequestContextGetterObserver {
  public:
-  // Called on the UI thread: create a websocket for a frame.
-  static void CreateWebSocketForFrame(int process_id,
-                                      int frame_id,
-                                      network::mojom::WebSocketRequest request);
-
-  // Called on the UI thread: create a websocket for a worker. Web workers of
-  // any type (dedicated, shared, service worker) do not have a frame.
-  static void CreateWebSocketWithOrigin(
-      int process_id,
-      url::Origin origin,
-      network::mojom::WebSocketRequest request,
-      int frame_id = MSG_ROUTING_NONE);
+  // Called on the UI thread: create a websocket.
+  // - For frames, |frame_id| should be their own id.
+  // - For dedicated workers, |frame_id| should be its parent frame's id.
+  // - For shared workers and service workers, |frame_id| should be
+  //   MSG_ROUTING_NONE because they do not have a frame.
+  static void CreateWebSocket(int process_id,
+                              int frame_id,
+                              url::Origin origin,
+                              network::mojom::WebSocketRequest request);
 
   // net::URLRequestContextGetterObserver implementation.
   void OnContextShuttingDown() override;