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/1027370
Reviewed-by: Kinuko Yasuda <[email protected]>
Reviewed-by: Yutaka Hirano <[email protected]>
Commit-Queue: Hiroki Nakagawa <[email protected]>
Cr-Commit-Position: refs/heads/master@{#553485}diff --git a/content/browser/renderer_interface_binders.cc b/content/browser/renderer_interface_binders.cc
index 24bd8c4e..81e1e82 100644
--- a/content/browser/renderer_interface_binders.cc
+++ b/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 @@
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
