Revert "Direct Sockets: Browser implementation for TCP connection establishment"

This reverts commit 40d318a5.

Reason for revert: New tests are failing on many builders, like:
https://ci.chromium.org/p/chromium/builders/ci/Win10%20Tests%20x64/49280

Original change's description:
> Direct Sockets: Browser implementation for TCP connection establishment
> 
> DirectSocketsServiceImpl::OpenTcpSocket() now calls
> CreateTCPConnectedSocket() on the network context.
> 
> Browser test DirectSocketsBrowserTest.OpenTcp_Options verifies
> that the remote address, port, buffer sizes and no-delay flag
> are passed successfully.
> 
> NavigatorSocket::PendingRequest has been split into
> TCPSocket and UDPSocket classes, currently with no web-exposed
> members implemented.
> https://github.com/WICG/raw-sockets/blob/master/docs/explainer.md#tcp
> https://github.com/WICG/raw-sockets/blob/master/docs/explainer.md#udp
> 
> 
> 
> 
> Explainer: https://github.com/WICG/raw-sockets/blob/master/docs/explainer.md
> 
> Intent to Prototype:
> https://groups.google.com/a/chromium.org/g/blink-dev/c/ARtkaw4e9T4/m/npjeMssPCAAJ
> 
> Design doc:
> https://docs.google.com/document/d/1Xa5nFkIWxkL3hZHvDYWPhT8sZvNeFpCUKNuqIwZHxnE/edit?usp=sharing
> 
> 
> 
> Bug: 905818
> Change-Id: I7030f73d4863767b3d51a615fd84380148011bec
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2391181
> Commit-Queue: Jeremy Roman <jbroman@chromium.org>
> Auto-Submit: Eric Willigers <ericwilligers@chromium.org>
> Reviewed-by: Jeremy Roman <jbroman@chromium.org>
> Reviewed-by: Christian Dullweber <dullweber@chromium.org>
> Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
> Reviewed-by: Glen Robertson <glenrob@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#805850}

TBR=kinuko@chromium.org,jbroman@chromium.org,ericwilligers@chromium.org,dullweber@chromium.org,glenrob@chromium.org

Change-Id: I1dd6b7bab117365bf22384c61dc1d3158bf10c58
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 905818
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2404821Reviewed-by: Sebastien Lalancette <seblalancette@chromium.org>
Commit-Queue: Sebastien Lalancette <seblalancette@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805881}

content/browser/BUILD.gn

@@ -839,6 +839,8 @@ source_set("browser") {
     "devtools/shared_worker_devtools_manager.h",
     "devtools/worker_devtools_agent_host.cc",
     "devtools/worker_devtools_agent_host.h",
+    "direct_sockets/direct_sockets_service_impl.cc",
+    "direct_sockets/direct_sockets_service_impl.h",
     "display_cutout/display_cutout_constants.h",
     "display_cutout/display_cutout_host_impl.cc",
     "display_cutout/display_cutout_host_impl.h",
@@ -2593,10 +2595,6 @@ source_set("browser") {
       "host_zoom_map_impl.cc",
       "host_zoom_map_impl.h",
 
-      # The Direct Sockets API is not implemented on Android.
-      "direct_sockets/direct_sockets_service_impl.cc",
-      "direct_sockets/direct_sockets_service_impl.h",
-
       # The Serial API is not implemented on Android.
       "serial/serial_service.cc",
       "serial/serial_service.h",

content/browser/direct_sockets/direct_sockets_browsertest.cc

@@ -2,95 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <vector>
-
-#include "base/optional.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/bind_test_util.h"
 #include "base/test/scoped_feature_list.h"
 #include "content/browser/direct_sockets/direct_sockets_service_impl.h"
-#include "content/public/browser/browser_context.h"
-#include "content/public/browser/storage_partition.h"
-#include "content/public/browser/web_contents.h"
 #include "content/public/common/content_features.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
-#include "content/shell/browser/shell.h"
-#include "mojo/public/cpp/bindings/remote.h"
-#include "net/base/ip_address.h"
-#include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
-#include "net/traffic_annotation/network_traffic_annotation.h"
-#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
-#include "services/network/public/mojom/network_context.mojom.h"
-#include "services/network/public/mojom/tcp_socket.mojom.h"
-#include "services/network/test/test_network_context.h"
 #include "url/gurl.h"
 
 namespace content {
 
-namespace {
-
-enum class ProtocolType { kTcp, kUdp };
-
-struct RecordedCall {
-  ProtocolType protocol_type;
-
-  std::string remote_address;
-  uint16_t remote_port;
-
-  int32_t send_buffer_size = 0;
-  int32_t receive_buffer_size = 0;
-
-  bool no_delay = false;
-};
-
-class MockNetworkContext : public network::TestNetworkContext {
- public:
-  explicit MockNetworkContext(net::Error result) : result_(result) {}
-
-  const std::vector<RecordedCall>& history() const { return history_; }
-
-  // network::TestNetworkContext:
-  void CreateTCPConnectedSocket(
-      const base::Optional<net::IPEndPoint>& local_addr,
-      const net::AddressList& remote_addr_list,
-      network::mojom::TCPConnectedSocketOptionsPtr tcp_connected_socket_options,
-      const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
-      mojo::PendingReceiver<network::mojom::TCPConnectedSocket> socket,
-      mojo::PendingRemote<network::mojom::SocketObserver> observer,
-      CreateTCPConnectedSocketCallback callback) override {
-    history_.push_back(RecordedCall{
-        ProtocolType::kTcp, remote_addr_list[0].address().ToString(),
-        remote_addr_list[0].port(),
-        tcp_connected_socket_options->send_buffer_size,
-        tcp_connected_socket_options->receive_buffer_size,
-        tcp_connected_socket_options->no_delay});
-
-    std::move(callback).Run(result_, base::nullopt, base::nullopt,
-                            mojo::ScopedDataPipeConsumerHandle(),
-                            mojo::ScopedDataPipeProducerHandle());
-  }
-
- private:
-  const net::Error result_;
-  std::vector<RecordedCall> history_;
-};
-
-net::Error UnconditionallyPermitConnection(
-    const blink::mojom::DirectSocketOptions& options,
-    net::IPAddress& remote_address) {
-  DCHECK(options.remote_hostname.has_value());
-  DCHECK(remote_address.AssignFromIPLiteral(*options.remote_hostname));
-  return net::OK;
-}
-
-}  // anonymous namespace
-
 class DirectSocketsBrowserTest : public ContentBrowserTest {
  public:
   DirectSocketsBrowserTest() {
@@ -102,34 +29,6 @@ class DirectSocketsBrowserTest : public ContentBrowserTest {
     return embedded_test_server()->GetURL("/direct_sockets/index.html");
   }
 
-  network::mojom::NetworkContext* GetNetworkContext() {
-    return BrowserContext::GetDefaultStoragePartition(browser_context())
-        ->GetNetworkContext();
-  }
-
-  // Returns the port listening for TCP connections.
-  uint16_t StartTcpServer() {
-    net::IPEndPoint local_addr;
-    base::RunLoop run_loop;
-    GetNetworkContext()->CreateTCPServerSocket(
-        net::IPEndPoint(net::IPAddress::IPv4Localhost(),
-                        /*port=*/0),
-        /*backlog=*/5,
-        net::MutableNetworkTrafficAnnotationTag(TRAFFIC_ANNOTATION_FOR_TESTS),
-        tcp_server_socket_.BindNewPipeAndPassReceiver(),
-        base::BindLambdaForTesting(
-            [&local_addr, &run_loop](
-                int32_t result,
-                const base::Optional<net::IPEndPoint>& local_addr_out) {
-              DCHECK_EQ(result, net::OK);
-              DCHECK(local_addr_out.has_value());
-              local_addr = *local_addr_out;
-              run_loop.Quit();
-            }));
-    run_loop.Run();
-    return local_addr.port();
-  }
-
  protected:
   void SetUp() override {
     embedded_test_server()->AddDefaultHandlers(GetTestDataFilePath());
@@ -139,23 +38,19 @@ class DirectSocketsBrowserTest : public ContentBrowserTest {
   }
 
  private:
-  BrowserContext* browser_context() {
-    return shell()->web_contents()->GetBrowserContext();
-  }
-
   base::test::ScopedFeatureList feature_list_;
-  mojo::Remote<network::mojom::TCPServerSocket> tcp_server_socket_;
 };
 
 IN_PROC_BROWSER_TEST_F(DirectSocketsBrowserTest, OpenTcp_Success) {
   EXPECT_TRUE(NavigateToURL(shell(), GetTestPageURL()));
 
   DirectSocketsServiceImpl::SetPermissionCallbackForTesting(
-      base::BindRepeating(&UnconditionallyPermitConnection));
+      base::BindLambdaForTesting(
+          [&](const blink::mojom::DirectSocketOptions&) { return net::OK; }));
 
-  const uint16_t listening_port = StartTcpServer();
+  // TODO(crbug.com/905818): Use port from a listening net::TCPServerSocket.
   const std::string script = base::StringPrintf(
-      "openTcp({remoteAddress: '127.0.0.1', remotePort: %d})", listening_port);
+      "openTcp({remoteAddress: '127.0.0.1', remotePort: %d})", 0);
 
   EXPECT_EQ("openTcp succeeded", EvalJs(shell(), script));
 }
@@ -163,9 +58,9 @@ IN_PROC_BROWSER_TEST_F(DirectSocketsBrowserTest, OpenTcp_Success) {
 IN_PROC_BROWSER_TEST_F(DirectSocketsBrowserTest, OpenTcp_NotAllowedError) {
   EXPECT_TRUE(NavigateToURL(shell(), GetTestPageURL()));
 
-  const uint16_t listening_port = StartTcpServer();
+  // TODO(crbug.com/905818): Use port from a listening net::TCPServerSocket.
   const std::string script = base::StringPrintf(
-      "openTcp({remoteAddress: '127.0.0.1', remotePort: %d})", listening_port);
+      "openTcp({remoteAddress: '127.0.0.1', remotePort: %d})", 0);
 
   EXPECT_EQ("openTcp failed: NotAllowedError: Permission denied",
             EvalJs(shell(), script));
@@ -182,76 +77,12 @@ IN_PROC_BROWSER_TEST_F(DirectSocketsBrowserTest, OpenTcp_CannotEvadeCors) {
             EvalJs(shell(), script));
 }
 
-IN_PROC_BROWSER_TEST_F(DirectSocketsBrowserTest, OpenTcp_OptionsOne) {
-  EXPECT_TRUE(NavigateToURL(shell(), GetTestPageURL()));
-
-  DirectSocketsServiceImpl::SetPermissionCallbackForTesting(
-      base::BindRepeating(&UnconditionallyPermitConnection));
-
-  MockNetworkContext mock_network_context(net::ERR_PROXY_CONNECTION_FAILED);
-  DirectSocketsServiceImpl::SetNetworkContextForTesting(&mock_network_context);
-  const std::string expected_result =
-      "openTcp failed: NotAllowedError: Permission denied";
-
-  const std::string script =
-      R"(
-          openTcp({
-            remoteAddress: '12.34.56.78',
-            remotePort: 9012,
-            sendBufferSize: 3456,
-            receiveBufferSize: 7890,
-            noDelay: false
-          })
-        )";
-  EXPECT_EQ(expected_result, EvalJs(shell(), script));
-
-  DCHECK_EQ(1U, mock_network_context.history().size());
-  const RecordedCall& call = mock_network_context.history()[0];
-  EXPECT_EQ(ProtocolType::kTcp, call.protocol_type);
-  EXPECT_EQ("12.34.56.78", call.remote_address);
-  EXPECT_EQ(9012, call.remote_port);
-  EXPECT_EQ(3456, call.send_buffer_size);
-  EXPECT_EQ(7890, call.receive_buffer_size);
-  EXPECT_EQ(false, call.no_delay);
-}
-
-IN_PROC_BROWSER_TEST_F(DirectSocketsBrowserTest, OpenTcp_OptionsTwo) {
-  EXPECT_TRUE(NavigateToURL(shell(), GetTestPageURL()));
-
-  DirectSocketsServiceImpl::SetPermissionCallbackForTesting(
-      base::BindRepeating(&UnconditionallyPermitConnection));
-
-  MockNetworkContext mock_network_context(net::OK);
-  DirectSocketsServiceImpl::SetNetworkContextForTesting(&mock_network_context);
-  const std::string expected_result = "openTcp succeeded";
-
-  const std::string script =
-      R"(
-          openTcp({
-            remoteAddress: 'fedc:ba98:7654:3210:fedc:ba98:7654:3210',
-            remotePort: 789,
-            sendBufferSize: 0,
-            receiveBufferSize: 1234,
-            noDelay: true
-          })
-        )";
-  EXPECT_EQ(expected_result, EvalJs(shell(), script));
-
-  DCHECK_EQ(1U, mock_network_context.history().size());
-  const RecordedCall& call = mock_network_context.history()[0];
-  EXPECT_EQ(ProtocolType::kTcp, call.protocol_type);
-  EXPECT_EQ("fedc:ba98:7654:3210:fedc:ba98:7654:3210", call.remote_address);
-  EXPECT_EQ(789, call.remote_port);
-  EXPECT_EQ(0, call.send_buffer_size);
-  EXPECT_EQ(1234, call.receive_buffer_size);
-  EXPECT_EQ(true, call.no_delay);
-}
-
 IN_PROC_BROWSER_TEST_F(DirectSocketsBrowserTest, OpenUdp_Success) {
   EXPECT_TRUE(NavigateToURL(shell(), GetTestPageURL()));
 
   DirectSocketsServiceImpl::SetPermissionCallbackForTesting(
-      base::BindRepeating(&UnconditionallyPermitConnection));
+      base::BindLambdaForTesting(
+          [&](const blink::mojom::DirectSocketOptions&) { return net::OK; }));
 
   // TODO(crbug.com/1119620): Use port from a listening net::UDPServerSocket.
   const std::string script = base::StringPrintf(

content/browser/direct_sockets/direct_sockets_service_impl.cc

@@ -14,16 +14,11 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_features.h"
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
-#include "mojo/public/cpp/system/data_pipe.h"
-#include "net/base/address_list.h"
-#include "services/network/public/mojom/network_context.mojom.h"
 
 namespace content {
 
 namespace {
 
-constexpr int32_t kMaxBufferSize = 32 * 1024 * 1024;
-
 DirectSocketsServiceImpl::PermissionCallback&
 GetPermissionCallbackForTesting() {
   static base::NoDestructor<DirectSocketsServiceImpl::PermissionCallback>
@@ -31,11 +26,6 @@ GetPermissionCallbackForTesting() {
   return *callback;
 }
 
-network::mojom::NetworkContext*& GetNetworkContextForTesting() {
-  static network::mojom::NetworkContext* network_context = nullptr;
-  return network_context;
-}
-
 }  // namespace
 
 DirectSocketsServiceImpl::DirectSocketsServiceImpl(RenderFrameHost& frame_host)
@@ -54,71 +44,42 @@ void DirectSocketsServiceImpl::CreateForFrame(
 
 void DirectSocketsServiceImpl::OpenTcpSocket(
     blink::mojom::DirectSocketOptionsPtr options,
-    const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
-    mojo::PendingReceiver<network::mojom::TCPConnectedSocket> receiver,
-    mojo::PendingRemote<network::mojom::SocketObserver> observer,
     OpenTcpSocketCallback callback) {
   if (!options) {
     mojo::ReportBadMessage("Invalid request to open socket");
     return;
   }
-  net::IPAddress remote_address;
-  const net::Error result = ValidateOptions(*options, remote_address);
+  net::Error result = EnsurePermission(*options);
 
   // TODO(crbug.com/1119681): Collect metrics for usage and permission checks
 
-  if (result != net::OK) {
-    std::move(callback).Run(result, base::nullopt, base::nullopt,
-                            mojo::ScopedDataPipeConsumerHandle(),
-                            mojo::ScopedDataPipeProducerHandle());
-    return;
+  if (result == net::OK) {
+    // TODO(crbug.com/905818): GetNetworkContext()->CreateTCPConnectedSocket
+    GetNetworkContext();
+    NOTIMPLEMENTED();
   }
 
-  // TODO(crbug.com/905818): Populate local_addr from options.
-  const base::Optional<net::IPEndPoint> local_addr = base::nullopt;
-
-  network::mojom::TCPConnectedSocketOptionsPtr tcp_connected_socket_options =
-      network::mojom::TCPConnectedSocketOptions::New();
-  if (options->send_buffer_size > 0) {
-    tcp_connected_socket_options->send_buffer_size =
-        std::min(options->send_buffer_size, kMaxBufferSize);
-  }
-  if (options->receive_buffer_size > 0) {
-    tcp_connected_socket_options->receive_buffer_size =
-        std::min(options->receive_buffer_size, kMaxBufferSize);
-  }
-  tcp_connected_socket_options->no_delay = options->no_delay;
-
-  GetNetworkContext()->CreateTCPConnectedSocket(
-      local_addr,
-      net::AddressList::CreateFromIPAddress(remote_address,
-                                            options->remote_port),
-      std::move(tcp_connected_socket_options), traffic_annotation,
-      std::move(receiver), std::move(observer), std::move(callback));
+  std::move(callback).Run(result);
 }
 
 void DirectSocketsServiceImpl::OpenUdpSocket(
     blink::mojom::DirectSocketOptionsPtr options,
-    mojo::PendingReceiver<network::mojom::UDPSocket> receiver,
-    mojo::PendingRemote<network::mojom::UDPSocketListener> listener,
     OpenUdpSocketCallback callback) {
   if (!options) {
     mojo::ReportBadMessage("Invalid request to open socket");
     return;
   }
-  net::IPAddress remote_address;
-  const net::Error result = ValidateOptions(*options, remote_address);
+  net::Error result = EnsurePermission(*options);
 
   // TODO(crbug.com/1119681): Collect metrics for usage and permission checks
 
   if (result == net::OK) {
     // TODO(crbug.com/1119620): GetNetworkContext()->CreateUDPSocket
-    // TODO(crbug.com/1119620): Connect(remote_addr, udp_socket_options)
     GetNetworkContext();
     NOTIMPLEMENTED();
   }
 
-  std::move(callback).Run(result, base::nullopt, base::nullopt);
+  std::move(callback).Run(result);
 }
 
 // static
@@ -127,12 +88,6 @@ void DirectSocketsServiceImpl::SetPermissionCallbackForTesting(
   GetPermissionCallbackForTesting() = std::move(callback);
 }
 
-// static
-void DirectSocketsServiceImpl::SetNetworkContextForTesting(
-    network::mojom::NetworkContext* network_context) {
-  GetNetworkContextForTesting() = network_context;
-}
-
 void DirectSocketsServiceImpl::RenderFrameDeleted(
     RenderFrameHost* render_frame_host) {
   if (render_frame_host == frame_host_)
@@ -143,16 +98,15 @@ void DirectSocketsServiceImpl::WebContentsDestroyed() {
   frame_host_ = nullptr;
 }
 
-net::Error DirectSocketsServiceImpl::ValidateOptions(
-    const blink::mojom::DirectSocketOptions& options,
-    net::IPAddress& remote_address) {
+net::Error DirectSocketsServiceImpl::EnsurePermission(
+    const blink::mojom::DirectSocketOptions& options) {
   DCHECK(base::FeatureList::IsEnabled(features::kDirectSockets));
 
   if (!frame_host_)
     return net::ERR_CONTEXT_SHUT_DOWN;
 
   if (GetPermissionCallbackForTesting())
-    return GetPermissionCallbackForTesting().Run(options, remote_address);
+    return GetPermissionCallbackForTesting().Run(options);
 
   if (options.send_buffer_size < 0 || options.receive_buffer_size < 0)
     return net::ERR_INVALID_ARGUMENT;
@@ -166,28 +120,15 @@ net::Error DirectSocketsServiceImpl::ValidateOptions(
     return net::ERR_UNSAFE_PORT;
   }
 
-  // ValidateOptions() will need to become asynchronous:
-  // TODO(crbug.com/1119597): Show consent dialog.
-  // TODO(crbug.com/1119597): Use the hostname provided by the user.
+  // EnsurePermission() will need to become asynchronous:
+  // TODO(crbug.com/1119597): Show consent dialog
   // TODO(crbug.com/1119661): Reject hostnames that resolve to non-public
   // addresses.
-  if (!options.remote_hostname)
-    return net::ERR_NAME_NOT_RESOLVED;
-
-  // TODO(crbug.com/905818): Support resolved hostnames.
-  // TODO(crbug.com/1124255): Support mDNS.
-  if (!remote_address.AssignFromIPLiteral(*options.remote_hostname))
-    return net::ERR_NAME_NOT_RESOLVED;
 
   return net::ERR_NOT_IMPLEMENTED;
 }
 
 network::mojom::NetworkContext* DirectSocketsServiceImpl::GetNetworkContext() {
-  if (network::mojom::NetworkContext* network_context =
-          GetNetworkContextForTesting()) {
-    return network_context;
-  }
-
   return frame_host_->GetStoragePartition()->GetNetworkContext();
 }
 

content/browser/direct_sockets/direct_sockets_service_impl.h

@@ -12,7 +12,6 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
-#include "net/base/ip_address.h"
 #include "net/base/net_errors.h"
 #include "third_party/blink/public/mojom/direct_sockets/direct_sockets.mojom.h"
 
@@ -29,8 +28,8 @@ class CONTENT_EXPORT DirectSocketsServiceImpl
     : public blink::mojom::DirectSocketsService,
       public WebContentsObserver {
  public:
-  using PermissionCallback = base::RepeatingCallback<
-      net::Error(const blink::mojom::DirectSocketOptions&, net::IPAddress&)>;
+  using PermissionCallback = base::RepeatingCallback<net::Error(
+      const blink::mojom::DirectSocketOptions&)>;
 
   explicit DirectSocketsServiceImpl(RenderFrameHost& frame_host);
   ~DirectSocketsServiceImpl() override = default;
@@ -43,17 +42,10 @@ class CONTENT_EXPORT DirectSocketsServiceImpl
       mojo::PendingReceiver<blink::mojom::DirectSocketsService> receiver);
 
   // blink::mojom::DirectSocketsService override:
-  void OpenTcpSocket(
-      blink::mojom::DirectSocketOptionsPtr options,
-      const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
-      mojo::PendingReceiver<network::mojom::TCPConnectedSocket> socket,
-      mojo::PendingRemote<network::mojom::SocketObserver> observer,
-      OpenTcpSocketCallback callback) override;
-  void OpenUdpSocket(
-      blink::mojom::DirectSocketOptionsPtr options,
-      mojo::PendingReceiver<network::mojom::UDPSocket> receiver,
-      mojo::PendingRemote<network::mojom::UDPSocketListener> listener,
-      OpenUdpSocketCallback callback) override;
+  void OpenTcpSocket(blink::mojom::DirectSocketOptionsPtr options,
+                     OpenTcpSocketCallback callback) override;
+  void OpenUdpSocket(blink::mojom::DirectSocketOptionsPtr options,
+                     OpenUdpSocketCallback callback) override;
 
   // WebContentsObserver override:
   void RenderFrameDeleted(RenderFrameHost* render_frame_host) override;
@@ -61,15 +53,10 @@ class CONTENT_EXPORT DirectSocketsServiceImpl
 
   static void SetPermissionCallbackForTesting(PermissionCallback callback);
 
-  static void SetNetworkContextForTesting(network::mojom::NetworkContext*);
-
  private:
   friend class DirectSocketsUnitTest;
 
-  // Returns net::OK and populates |remote_address| if the options are valid and
-  // the connection is permitted.
-  net::Error ValidateOptions(const blink::mojom::DirectSocketOptions& options,
-                             net::IPAddress& remote_address);
+  net::Error EnsurePermission(const blink::mojom::DirectSocketOptions& options);
 
   network::mojom::NetworkContext* GetNetworkContext();
 

content/browser/direct_sockets/direct_sockets_unittest.cc

@@ -8,7 +8,6 @@
 #include "content/browser/direct_sockets/direct_sockets_service_impl.h"
 #include "content/public/common/content_features.h"
 #include "content/public/test/test_renderer_host.h"
-#include "net/base/ip_address.h"
 #include "net/base/net_errors.h"
 #include "third_party/blink/public/mojom/direct_sockets/direct_sockets.mojom.h"
 
@@ -31,9 +30,9 @@ class DirectSocketsUnitTest : public RenderViewHostTestHarness {
     return *direct_sockets_service_;
   }
 
-  net::Error ValidateOptions(const blink::mojom::DirectSocketOptions& options) {
-    net::IPAddress remote_address;
-    return direct_sockets_service().ValidateOptions(options, remote_address);
+  net::Error EnsurePermission(
+      const blink::mojom::DirectSocketOptions& options) {
+    return direct_sockets_service().EnsurePermission(options);
   }
 
  private:
@@ -45,20 +44,14 @@ TEST_F(DirectSocketsUnitTest, RenderFrameDeleted) {
   direct_sockets_service().RenderFrameDeleted(main_rfh());
 
   blink::mojom::DirectSocketOptions options;
-  EXPECT_EQ(ValidateOptions(options), net::ERR_CONTEXT_SHUT_DOWN);
+  EXPECT_EQ(EnsurePermission(options), net::ERR_CONTEXT_SHUT_DOWN);
 }
 
 TEST_F(DirectSocketsUnitTest, WebContentsDestroyed) {
   direct_sockets_service().WebContentsDestroyed();
 
   blink::mojom::DirectSocketOptions options;
-  EXPECT_EQ(ValidateOptions(options), net::ERR_CONTEXT_SHUT_DOWN);
-}
-
-// TODO(crbug.com/1119597): Allow the user to enter the address.
-TEST_F(DirectSocketsUnitTest, RemoteAddressCurrentlyRequired) {
-  blink::mojom::DirectSocketOptions options;
-  EXPECT_EQ(ValidateOptions(options), net::ERR_NAME_NOT_RESOLVED);
+  EXPECT_EQ(EnsurePermission(options), net::ERR_CONTEXT_SHUT_DOWN);
 }
 
 }  // namespace content

third_party/blink/public/mojom/BUILD.gn

@@ -45,6 +45,7 @@ mojom("mojom_platform") {
     "devtools/devtools_agent.mojom",
     "devtools/devtools_frontend.mojom",
     "devtools/inspector_issue.mojom",
+    "direct_sockets/direct_sockets.mojom",
     "disk_allocator.mojom",
     "favicon/favicon_url.mojom",
     "feature_observer/feature_observer.mojom",
@@ -241,10 +242,7 @@ mojom("mojom_platform") {
       "//ui/latency/mojom",
     ]
   } else {
-    sources += [
-      "direct_sockets/direct_sockets.mojom",
-      "serial/serial.mojom",
-    ]
+    sources += [ "serial/serial.mojom" ]
   }
 
   if (is_mac) {

third_party/blink/public/mojom/direct_sockets/direct_sockets.mojom

@@ -7,11 +7,6 @@ module blink.mojom;
 // Explainer for the Direct Sockets API:
 // https://github.com/WICG/raw-sockets/blob/master/docs/explainer.md
 
-import "services/network/public/mojom/ip_endpoint.mojom";
-import "services/network/public/mojom/mutable_network_traffic_annotation_tag.mojom";
-import "services/network/public/mojom/tcp_socket.mojom";
-import "services/network/public/mojom/udp_socket.mojom";
-
 struct DirectSocketOptions {
   string? local_hostname;
   uint16 local_port = 0;
@@ -22,7 +17,8 @@ struct DirectSocketOptions {
   int32 send_buffer_size = 0;
   int32 receive_buffer_size = 0;
 
-  // Only relevant for TCP:
+  // These are only relevant for TCP:
+  bool keep_alive = false;
   bool no_delay = false;
 };
 
@@ -30,32 +26,15 @@ struct DirectSocketOptions {
 // permission checking, chooser showing, etc.
 // The browser process implements the interface, and the renderer process
 // sends messages to it.
+// The return values are net::Error codes. 0 indicates success.
 interface DirectSocketsService {
-  // Creates a connected TCP socket.
-  // |result| is a net::Error code (net::OK on success).
-  // |observer| if non-null will be used to listen for any network connection
-  // error on the newly established connection.
-  // Caller is to use |send_stream| to send data and |receive_stream|
-  // to receive data over the connection.
+  // TODO(crbug.com/905818): Return TCP socket details
   OpenTcpSocket(
-      DirectSocketOptions options,
-      network.mojom.MutableNetworkTrafficAnnotationTag traffic_annotation,
-      pending_receiver<network.mojom.TCPConnectedSocket> receiver,
-      pending_remote<network.mojom.SocketObserver>? observer)
-      => (int32 result,
-          network.mojom.IPEndPoint? local_addr,
-          network.mojom.IPEndPoint? peer_addr,
-          handle<data_pipe_consumer>? receive_stream,
-          handle<data_pipe_producer>? send_stream);
-
-  // Creates a 'connected' UDP socket.
-  // |result| is a net::Error code (net::OK on success).
-  // Caller can supply a |listener| to listen for incoming datagrams.
+      DirectSocketOptions options)
+      => (int32 result);
+
+  // TODO(crbug.com/1119620): Return UDP socket details
   OpenUdpSocket(
-      DirectSocketOptions options,
-      pending_receiver<network.mojom.UDPSocket> receiver,
-      pending_remote<network.mojom.UDPSocketListener>? listener)
-      => (int32 result,
-          network.mojom.IPEndPoint? local_addr,
-          network.mojom.IPEndPoint? peer_addr);
+      DirectSocketOptions options)
+      => (int32 result);
 };

third_party/blink/renderer/bindings/generated_in_modules.gni

@@ -2133,7 +2133,7 @@ generated_interface_sources_in_modules = [
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_world_tracking_state.h",
 ]
 
-# Serial and Direct Sockets
+# Serial
 if (!is_android) {
   generated_dictionary_sources_in_modules += [
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_serial_connection_event_init.cc",
@@ -2150,8 +2150,6 @@ if (!is_android) {
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_serial_port_info.h",
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_serial_port_request_options.cc",
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_serial_port_request_options.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_socket_options.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_socket_options.h",
   ]
   generated_enumeration_sources_in_modules += [
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_flow_control_type.cc",
@@ -2166,10 +2164,6 @@ if (!is_android) {
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_serial_connection_event.h",
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_serial_port.cc",
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_serial_port.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_tcp_socket.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_tcp_socket.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_udp_socket.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_udp_socket.h",
   ]
 }
 

third_party/blink/renderer/bindings/idl_in_modules.gni

@@ -579,6 +579,8 @@ static_idl_files_in_modules = get_path_info(
           "//third_party/blink/renderer/modules/quota/storage_usage_details.idl",
           "//third_party/blink/renderer/modules/quota/window_quota.idl",
           "//third_party/blink/renderer/modules/quota/worker_navigator_storage_quota.idl",
+          "//third_party/blink/renderer/modules/direct_sockets/navigator_socket.idl",
+          "//third_party/blink/renderer/modules/direct_sockets/socket_options.idl",
           "//third_party/blink/renderer/modules/remoteplayback/html_media_element_remote_playback.idl",
           "//third_party/blink/renderer/modules/remoteplayback/remote_playback.idl",
           "//third_party/blink/renderer/modules/sanitizer_api/sanitizer.idl",
@@ -1020,14 +1022,10 @@ static_idl_files_in_modules = get_path_info(
         ],
         "abspath")
 
-# Serial and Direct Sockets
+# Serial
 if (!is_android) {
   static_idl_files_in_modules += get_path_info(
           [
-            "//third_party/blink/renderer/modules/direct_sockets/navigator_socket.idl",
-            "//third_party/blink/renderer/modules/direct_sockets/tcp_socket.idl",
-            "//third_party/blink/renderer/modules/direct_sockets/udp_socket.idl",
-            "//third_party/blink/renderer/modules/direct_sockets/socket_options.idl",
             "//third_party/blink/renderer/modules/serial/navigator_serial.idl",
             "//third_party/blink/renderer/modules/serial/serial.idl",
             "//third_party/blink/renderer/modules/serial/serial_connection_event.idl",

third_party/blink/renderer/modules/BUILD.gn

@@ -136,6 +136,7 @@ component("modules") {
     "//third_party/blink/renderer/modules/presentation",
     "//third_party/blink/renderer/modules/push_messaging",
     "//third_party/blink/renderer/modules/quota",
+    "//third_party/blink/renderer/modules/direct_sockets",
     "//third_party/blink/renderer/modules/remoteplayback",
     "//third_party/blink/renderer/modules/sanitizer_api",
     "//third_party/blink/renderer/modules/scheduler",
@@ -168,10 +169,7 @@ component("modules") {
   if (is_android) {
     sub_modules += [ "//third_party/blink/renderer/modules/remote_objects" ]
   } else {
-    sub_modules += [
-      "//third_party/blink/renderer/modules/direct_sockets",
-      "//third_party/blink/renderer/modules/serial",
-    ]
+    sub_modules += [ "//third_party/blink/renderer/modules/serial" ]
   }
 
   deps = [

third_party/blink/renderer/modules/DEPS

@@ -4,7 +4,6 @@ include_rules = [
     "+base/strings/char_traits.h",
     "+mojo/public/cpp/bindings",
     "+mojo/public/cpp/system",
-    "+net/base/net_errors.h",
     "+services/device/public/mojom",
     "+services/network/public/cpp/shared_url_loader_factory.h",
     "+services/viz/public/mojom/hit_test/hit_test_region_list.mojom-blink.h",

third_party/blink/renderer/modules/direct_sockets/BUILD.gn

@@ -8,10 +8,5 @@ blink_modules_sources("direct_sockets") {
   sources = [
     "navigator_socket.cc",
     "navigator_socket.h",
-    "tcp_socket.cc",
-    "tcp_socket.h",
-    "udp_socket.cc",
-    "udp_socket.h",
   ]
-  deps = [ "//net:net" ]
 }

third_party/blink/renderer/modules/direct_sockets/idls.gni

@@ -2,11 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-modules_idl_files = [
-  "tcp_socket.idl",
-  "udp_socket.idl",
-]
-
 modules_dictionary_idl_files = [ "socket_options.idl" ]
 
 modules_dependency_idl_files = [ "navigator_socket.idl" ]

third_party/blink/renderer/modules/direct_sockets/navigator_socket.cc

@@ -5,9 +5,6 @@
 #include "third_party/blink/renderer/modules/direct_sockets/navigator_socket.h"
 
 #include "base/macros.h"
-#include "base/optional.h"
-#include "services/network/public/mojom/tcp_socket.mojom-blink.h"
-#include "services/network/public/mojom/udp_socket.mojom-blink.h"
 #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
 #include "third_party/blink/public/platform/task_type.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
@@ -21,26 +18,84 @@
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/heap/persistent.h"
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
+#include "third_party/blink/renderer/platform/scheduler/public/frame_or_worker_scheduler.h"
 #include "third_party/blink/renderer/platform/wtf/functional.h"
 
 namespace blink {
 
-constexpr net::NetworkTrafficAnnotationTag kDirectSocketsTrafficAnnotation =
-    net::DefineNetworkTrafficAnnotation("direct_sockets", R"(
-        semantics {
-          sender: "Direct Sockets API"
-          description: "Web app request to communicate with network device"
-          trigger: "User consents to network connection and enters destination address"
-          data: "Any data sent by web app"
-          destination: OTHER
-          destination_other: "Address entered by user in consent dialog"
-        }
-        policy {
-          cookies_allowed: NO
-          setting: "This feature cannot yet be controlled by settings."
-          policy_exception_justification: "To be implemented"
-        }
-      )");
+class NavigatorSocket::PendingRequest final
+    : public GarbageCollected<PendingRequest> {
+ public:
+  PendingRequest(NavigatorSocket&, ScriptPromiseResolver&);
+
+  // TODO(crbug.com/905818): Resolve Promise<TCPSocket>
+  void TcpCallback(int32_t result);
+
+  // TODO(crbug.com/1119620): Resolve Promise<UDPSocket>
+  void UdpCallback(int32_t result);
+
+  void OnConnectionError();
+
+  void Trace(Visitor* visitor) const {
+    visitor->Trace(navigator_);
+    visitor->Trace(resolver_);
+  }
+
+ private:
+  WeakMember<NavigatorSocket> navigator_;
+  Member<ScriptPromiseResolver> resolver_;
+  FrameOrWorkerScheduler::SchedulingAffectingFeatureHandle
+      feature_handle_for_scheduler_;
+};
+
+NavigatorSocket::PendingRequest::PendingRequest(
+    NavigatorSocket& navigator_socket,
+    ScriptPromiseResolver& resolver)
+    : navigator_(&navigator_socket),
+      resolver_(&resolver),
+      feature_handle_for_scheduler_(
+          ExecutionContext::From(resolver_->GetScriptState())
+              ->GetScheduler()
+              ->RegisterFeature(
+                  SchedulingPolicy::Feature::
+                      kOutstandingNetworkRequestDirectSocket,
+                  {SchedulingPolicy::RecordMetricsForBackForwardCache()})) {}
+
+void NavigatorSocket::PendingRequest::TcpCallback(int32_t result) {
+  if (navigator_)
+    navigator_->pending_requests_.erase(this);
+
+  // TODO(crbug.com/905818): Compare with net::OK
+  if (result == 0) {
+    // TODO(crbug.com/905818): Resolve TCPSocket
+    NOTIMPLEMENTED();
+    resolver_->Resolve();
+  } else {
+    resolver_->Reject(MakeGarbageCollected<DOMException>(
+        DOMExceptionCode::kNotAllowedError, "Permission denied"));
+  }
+}
+
+void NavigatorSocket::PendingRequest::UdpCallback(int32_t result) {
+  if (navigator_)
+    navigator_->pending_requests_.erase(this);
+
+  // TODO(crbug.com/1119620): Compare with net::OK
+  if (result == 0) {
+    // TODO(crbug.com/1119620): Resolve UDPSocket
+    NOTIMPLEMENTED();
+    resolver_->Resolve();
+  } else {
+    resolver_->Reject(MakeGarbageCollected<DOMException>(
+        DOMExceptionCode::kNotAllowedError, "Permission denied"));
+  }
+}
+
+void NavigatorSocket::PendingRequest::OnConnectionError() {
+  resolver_->Reject(MakeGarbageCollected<DOMException>(
+      DOMExceptionCode::kAbortError,
+      "Internal error: could not connect to DirectSocketsService interface."));
+}
 
 const char NavigatorSocket::kSupplementName[] = "NavigatorSocket";
 
@@ -88,8 +143,7 @@ void NavigatorSocket::ContextLifecycleStateChanged(
 
 void NavigatorSocket::Trace(Visitor* visitor) const {
   visitor->Trace(service_remote_);
-  visitor->Trace(pending_tcp_);
-  visitor->Trace(pending_udp_);
+  visitor->Trace(pending_requests_);
   Supplement<ExecutionContext>::Trace(visitor);
   ExecutionContextLifecycleStateObserver::Trace(visitor);
 }
@@ -127,6 +181,8 @@ mojom::blink::DirectSocketOptionsPtr NavigatorSocket::CreateSocketOptions(
   if (options.hasReceiveBufferSize())
     socket_options->receive_buffer_size = options.receiveBufferSize();
 
+  if (options.hasKeepAlive())
+    socket_options->keep_alive = options.keepAlive();
   if (options.hasNoDelay())
     socket_options->no_delay = options.noDelay();
 
@@ -140,16 +196,14 @@ ScriptPromise NavigatorSocket::openTCPSocket(ScriptState* script_state,
     return ScriptPromise();
 
   auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(script_state);
-  TCPSocket* pending = MakeGarbageCollected<TCPSocket>(*resolver);
-  pending_tcp_.insert(pending);
+  PendingRequest* pending =
+      MakeGarbageCollected<PendingRequest>(*this, *resolver);
+  pending_requests_.insert(pending);
   ScriptPromise promise = resolver->Promise();
 
   service_remote_->OpenTcpSocket(
       CreateSocketOptions(*options),
-      net::MutableNetworkTrafficAnnotationTag(kDirectSocketsTrafficAnnotation),
-      pending->GetTCPSocketReceiver(), pending->GetTCPSocketObserver(),
-      WTF::Bind(&NavigatorSocket::OnTcpOpen, WrapPersistent(this),
-                WrapPersistent(pending)));
+      WTF::Bind(&PendingRequest::TcpCallback, WrapPersistent(pending)));
   return promise;
 }
 
@@ -160,15 +214,14 @@ ScriptPromise NavigatorSocket::openUDPSocket(ScriptState* script_state,
     return ScriptPromise();
 
   auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(script_state);
-  UDPSocket* pending = MakeGarbageCollected<UDPSocket>(*resolver);
-  pending_udp_.insert(pending);
+  PendingRequest* pending =
+      MakeGarbageCollected<PendingRequest>(*this, *resolver);
+  pending_requests_.insert(pending);
   ScriptPromise promise = resolver->Promise();
 
   service_remote_->OpenUdpSocket(
-      CreateSocketOptions(*options), pending->GetUDPSocketReceiver(),
-      pending->GetUDPSocketListener(),
-      WTF::Bind(&NavigatorSocket::OnUdpOpen, WrapPersistent(this),
-                WrapPersistent(pending)));
+      CreateSocketOptions(*options),
+      WTF::Bind(&PendingRequest::UdpCallback, WrapPersistent(pending)));
   return promise;
 }
 
@@ -203,39 +256,11 @@ bool NavigatorSocket::OpenSocketPermitted(ScriptState* script_state,
   return true;
 }
 
-void NavigatorSocket::OnTcpOpen(
-    TCPSocket* socket,
-    int32_t result,
-    const base::Optional<net::IPEndPoint>& local_addr,
-    const base::Optional<net::IPEndPoint>& peer_addr,
-    mojo::ScopedDataPipeConsumerHandle receive_stream,
-    mojo::ScopedDataPipeProducerHandle send_stream) {
-  pending_tcp_.erase(socket);
-  socket->Init(result, local_addr, peer_addr, std::move(receive_stream),
-               std::move(send_stream));
-}
-
-void NavigatorSocket::OnUdpOpen(
-    UDPSocket* socket,
-    int32_t result,
-    const base::Optional<net::IPEndPoint>& local_addr,
-    const base::Optional<net::IPEndPoint>& peer_addr) {
-  pending_udp_.erase(socket);
-  socket->Init(result, local_addr, peer_addr);
-}
-
 void NavigatorSocket::OnConnectionError() {
-  for (auto& pending : pending_tcp_) {
-    pending->Init(net::Error::ERR_CONTEXT_SHUT_DOWN, base::nullopt,
-                  base::nullopt, mojo::ScopedDataPipeConsumerHandle(),
-                  mojo::ScopedDataPipeProducerHandle());
-  }
-  for (auto& pending : pending_udp_) {
-    pending->Init(net::Error::ERR_CONTEXT_SHUT_DOWN, base::nullopt,
-                  base::nullopt);
+  for (auto& pending : pending_requests_) {
+    pending->OnConnectionError();
   }
-  pending_tcp_.clear();
-  pending_udp_.clear();
+  pending_requests_.clear();
   service_remote_.reset();
 }
 

third_party/blink/renderer/modules/direct_sockets/navigator_socket.h

@@ -9,13 +9,10 @@
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_state_observer.h"
-#include "third_party/blink/renderer/modules/direct_sockets/tcp_socket.h"
-#include "third_party/blink/renderer/modules/direct_sockets/udp_socket.h"
 #include "third_party/blink/renderer/modules/modules_export.h"
 #include "third_party/blink/renderer/platform/bindings/exception_code.h"
 #include "third_party/blink/renderer/platform/heap/heap.h"
 #include "third_party/blink/renderer/platform/heap/heap_allocator.h"
-#include "third_party/blink/renderer/platform/heap/member.h"
 #include "third_party/blink/renderer/platform/mojo/heap_mojo_remote.h"
 #include "third_party/blink/renderer/platform/supplementable.h"
 
@@ -62,6 +59,8 @@ class MODULES_EXPORT NavigatorSocket final
   void Trace(Visitor*) const override;
 
  private:
+  class PendingRequest;
+
   // Binds service_remote_ if not already bound.
   void EnsureServiceConnected(LocalDOMWindow&);
 
@@ -79,25 +78,12 @@ class MODULES_EXPORT NavigatorSocket final
   // Updates exception state whenever returning false.
   bool OpenSocketPermitted(ScriptState*, const SocketOptions*, ExceptionState&);
 
-  void OnTcpOpen(TCPSocket* socket,
-                 int32_t result,
-                 const base::Optional<net::IPEndPoint>& local_addr,
-                 const base::Optional<net::IPEndPoint>& peer_addr,
-                 mojo::ScopedDataPipeConsumerHandle receive_stream,
-                 mojo::ScopedDataPipeProducerHandle send_stream);
-
-  void OnUdpOpen(UDPSocket* socket,
-                 int32_t result,
-                 const base::Optional<net::IPEndPoint>& local_addr,
-                 const base::Optional<net::IPEndPoint>& peer_addr);
-
   void OnConnectionError();
 
   HeapMojoRemote<blink::mojom::blink::DirectSocketsService> service_remote_{
       nullptr};
 
-  HeapHashSet<Member<TCPSocket>> pending_tcp_;
-  HeapHashSet<Member<UDPSocket>> pending_udp_;
+  HeapHashSet<Member<PendingRequest>> pending_requests_;
 };
 
 }  // namespace blink

third_party/blink/renderer/modules/direct_sockets/navigator_socket.idl

@@ -9,9 +9,11 @@
   ImplementedAs=NavigatorSocket,
   RuntimeEnabled=DirectSockets
 ] partial interface Navigator {
+  // TODO(crbug.com/905818): Return Promise<TCPSocket>
   [SecureContext, RaisesException, CallWith=ScriptState, Measure]
-  Promise<TCPSocket> openTCPSocket(optional SocketOptions options = {});
+  Promise<void> openTCPSocket(optional SocketOptions options = {});
 
+  // TODO(crbug.com/1119620): Return Promise<UDPSocket>
   [SecureContext, RaisesException, CallWith=ScriptState, Measure]
-  Promise<UDPSocket> openUDPSocket(optional SocketOptions options = {});
+  Promise<void> openUDPSocket(optional SocketOptions options = {});
 };

third_party/blink/renderer/modules/direct_sockets/tcp_socket.cc

-// Copyright 2020 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 "third_party/blink/renderer/modules/direct_sockets/tcp_socket.h"
-
-#include "base/macros.h"
-#include "net/base/net_errors.h"
-#include "third_party/blink/renderer/core/dom/dom_exception.h"
-#include "third_party/blink/renderer/core/execution_context/execution_context.h"
-#include "third_party/blink/renderer/platform/scheduler/public/scheduling_policy.h"
-#include "third_party/blink/renderer/platform/wtf/functional.h"
-
-namespace blink {
-
-TCPSocket::TCPSocket(ScriptPromiseResolver& resolver)
-    : resolver_(&resolver),
-      feature_handle_for_scheduler_(
-          ExecutionContext::From(resolver_->GetScriptState())
-              ->GetScheduler()
-              ->RegisterFeature(
-                  SchedulingPolicy::Feature::
-                      kOutstandingNetworkRequestDirectSocket,
-                  {SchedulingPolicy::RecordMetricsForBackForwardCache()})) {
-  DCHECK(resolver_);
-}
-
-TCPSocket::~TCPSocket() = default;
-
-mojo::PendingReceiver<network::mojom::blink::TCPConnectedSocket>
-TCPSocket::GetTCPSocketReceiver() {
-  DCHECK(resolver_);
-  return tcp_socket_.BindNewPipeAndPassReceiver();
-}
-
-mojo::PendingRemote<network::mojom::blink::SocketObserver>
-TCPSocket::GetTCPSocketObserver() {
-  DCHECK(resolver_);
-  auto result = socket_observer_receiver_.BindNewPipeAndPassRemote();
-
-  socket_observer_receiver_.set_disconnect_handler(WTF::Bind(
-      &TCPSocket::OnSocketObserverConnectionError, WrapPersistent(this)));
-
-  return result;
-}
-
-void TCPSocket::Init(int32_t result,
-                     const base::Optional<net::IPEndPoint>& local_addr,
-                     const base::Optional<net::IPEndPoint>& peer_addr,
-                     mojo::ScopedDataPipeConsumerHandle receive_stream,
-                     mojo::ScopedDataPipeProducerHandle send_stream) {
-  DCHECK(resolver_);
-  if (result == net::Error::OK) {
-    // TODO(crbug.com/905818): Finish initialization.
-    NOTIMPLEMENTED();
-    resolver_->Resolve(this);
-  } else {
-    resolver_->Reject(MakeGarbageCollected<DOMException>(
-        DOMExceptionCode::kNotAllowedError, "Permission denied"));
-  }
-  resolver_ = nullptr;
-}
-
-ScriptPromise TCPSocket::close(ScriptState*, ExceptionState&) {
-  // TODO(crbug.com/905818): Implement close.
-  NOTIMPLEMENTED();
-  return ScriptPromise();
-}
-
-void TCPSocket::OnReadError(int32_t net_error) {
-  // TODO(crbug.com/905818): Implement error handling.
-  NOTIMPLEMENTED();
-}
-
-void TCPSocket::OnWriteError(int32_t net_error) {
-  // TODO(crbug.com/905818): Implement error handling.
-  NOTIMPLEMENTED();
-}
-
-void TCPSocket::Trace(Visitor* visitor) const {
-  visitor->Trace(resolver_);
-  ScriptWrappable::Trace(visitor);
-}
-
-void TCPSocket::OnSocketObserverConnectionError() {
-  // TODO(crbug.com/905818): Implement error handling.
-  NOTIMPLEMENTED();
-}
-
-}  // namespace blink

third_party/blink/renderer/modules/direct_sockets/tcp_socket.h

-// Copyright 2020 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.
-
-#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_DIRECT_SOCKETS_TCP_SOCKET_H_
-#define THIRD_PARTY_BLINK_RENDERER_MODULES_DIRECT_SOCKETS_TCP_SOCKET_H_
-
-#include "base/optional.h"
-#include "mojo/public/cpp/bindings/pending_receiver.h"
-#include "mojo/public/cpp/bindings/pending_remote.h"
-#include "mojo/public/cpp/bindings/receiver.h"
-#include "mojo/public/cpp/bindings/remote.h"
-#include "mojo/public/cpp/system/data_pipe.h"
-#include "services/network/public/mojom/tcp_socket.mojom-blink.h"
-#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
-#include "third_party/blink/renderer/modules/modules_export.h"
-#include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
-#include "third_party/blink/renderer/platform/heap/heap.h"
-#include "third_party/blink/renderer/platform/heap/member.h"
-#include "third_party/blink/renderer/platform/scheduler/public/frame_or_worker_scheduler.h"
-
-namespace net {
-class IPEndPoint;
-}  // namespace net
-
-namespace blink {
-
-class MODULES_EXPORT TCPSocket final
-    : public ScriptWrappable,
-      public network::mojom::blink::SocketObserver {
-  DEFINE_WRAPPERTYPEINFO();
-
- public:
-  explicit TCPSocket(ScriptPromiseResolver&);
-  ~TCPSocket() override;
-
-  TCPSocket(const TCPSocket&) = delete;
-  TCPSocket& operator=(const TCPSocket&) = delete;
-
-  // Called by NavigatorSocket when initiating a connection:
-  mojo::PendingReceiver<network::mojom::blink::TCPConnectedSocket>
-  GetTCPSocketReceiver();
-  mojo::PendingRemote<network::mojom::blink::SocketObserver>
-  GetTCPSocketObserver();
-  void Init(int32_t result,
-            const base::Optional<net::IPEndPoint>& local_addr,
-            const base::Optional<net::IPEndPoint>& peer_addr,
-            mojo::ScopedDataPipeConsumerHandle receive_stream,
-            mojo::ScopedDataPipeProducerHandle send_stream);
-
-  // Web-exposed function
-  ScriptPromise close(ScriptState*, ExceptionState&);
-
-  // network::mojom::blink::SocketObserver:
-  void OnReadError(int32_t net_error) override;
-  void OnWriteError(int32_t net_error) override;
-
-  // ScriptWrappable:
-  void Trace(Visitor* visitor) const override;
-
- private:
-  void OnSocketObserverConnectionError();
-
-  Member<ScriptPromiseResolver> resolver_;
-  FrameOrWorkerScheduler::SchedulingAffectingFeatureHandle
-      feature_handle_for_scheduler_;
-
-  mojo::Remote<network::mojom::blink::TCPConnectedSocket> tcp_socket_;
-  mojo::Receiver<network::mojom::blink::SocketObserver>
-      socket_observer_receiver_{this};
-};
-
-}  // namespace blink
-
-#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_DIRECT_SOCKETS_TCP_SOCKET_H_

third_party/blink/renderer/modules/direct_sockets/tcp_socket.idl

-// Copyright 2020 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.
-
-// https://github.com/WICG/raw-sockets/blob/master/docs/explainer.md#tcp
-
-[
-    Exposed=Window,
-    RuntimeEnabled=DirectSockets,
-    SecureContext
-] interface TCPSocket {
-  // TODO(crbug.com/905818): Add support for sending, receiving
-  // TODO(crbug.com/905818): Add measurement
-
-  [RaisesException, CallWith=ScriptState]
-  Promise<void> close();
-};

third_party/blink/renderer/modules/direct_sockets/udp_socket.cc

-// Copyright 2020 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 "third_party/blink/renderer/modules/direct_sockets/udp_socket.h"
-
-#include "base/macros.h"
-#include "net/base/net_errors.h"
-#include "third_party/blink/renderer/core/dom/dom_exception.h"
-#include "third_party/blink/renderer/core/execution_context/execution_context.h"
-#include "third_party/blink/renderer/platform/scheduler/public/scheduling_policy.h"
-#include "third_party/blink/renderer/platform/wtf/functional.h"
-
-namespace blink {
-
-UDPSocket::UDPSocket(ScriptPromiseResolver& resolver)
-    : resolver_(&resolver),
-      feature_handle_for_scheduler_(
-          ExecutionContext::From(resolver_->GetScriptState())
-              ->GetScheduler()
-              ->RegisterFeature(
-                  SchedulingPolicy::Feature::
-                      kOutstandingNetworkRequestDirectSocket,
-                  {SchedulingPolicy::RecordMetricsForBackForwardCache()})) {
-  DCHECK(resolver_);
-}
-
-UDPSocket::~UDPSocket() = default;
-
-mojo::PendingReceiver<network::mojom::blink::UDPSocket>
-UDPSocket::GetUDPSocketReceiver() {
-  DCHECK(resolver_);
-  return udp_socket_.BindNewPipeAndPassReceiver();
-}
-
-mojo::PendingRemote<network::mojom::blink::UDPSocketListener>
-UDPSocket::GetUDPSocketListener() {
-  DCHECK(resolver_);
-  auto result = socket_listener_receiver_.BindNewPipeAndPassRemote();
-
-  socket_listener_receiver_.set_disconnect_handler(WTF::Bind(
-      &UDPSocket::OnSocketListenerConnectionError, WrapPersistent(this)));
-
-  return result;
-}
-
-void UDPSocket::Init(int32_t result,
-                     const base::Optional<net::IPEndPoint>& local_addr,
-                     const base::Optional<net::IPEndPoint>& peer_addr) {
-  DCHECK(resolver_);
-  if (result == net::Error::OK) {
-    // TODO(crbug.com/1119620): Finish initialization.
-    NOTIMPLEMENTED();
-    resolver_->Resolve(this);
-  } else {
-    resolver_->Reject(MakeGarbageCollected<DOMException>(
-        DOMExceptionCode::kNotAllowedError, "Permission denied"));
-  }
-  resolver_ = nullptr;
-}
-
-ScriptPromise UDPSocket::close(ScriptState*, ExceptionState&) {
-  // TODO(crbug.com/905818): Implement close.
-  NOTIMPLEMENTED();
-  return ScriptPromise();
-}
-
-void UDPSocket::OnReceived(int32_t result,
-                           const base::Optional<::net::IPEndPoint>& src_addr,
-                           base::Optional<::base::span<const ::uint8_t>> data) {
-  // TODO(crbug.com/1119620): Implement.
-  NOTIMPLEMENTED();
-}
-
-void UDPSocket::Trace(Visitor* visitor) const {
-  visitor->Trace(resolver_);
-  ScriptWrappable::Trace(visitor);
-}
-
-void UDPSocket::OnSocketListenerConnectionError() {
-  // TODO(crbug.com/1119620): Implement UDP error handling.
-  NOTIMPLEMENTED();
-}
-
-}  // namespace blink

third_party/blink/renderer/modules/direct_sockets/udp_socket.h

-// Copyright 2020 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.
-
-#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_DIRECT_SOCKETS_UDP_SOCKET_H_
-#define THIRD_PARTY_BLINK_RENDERER_MODULES_DIRECT_SOCKETS_UDP_SOCKET_H_
-
-#include "base/optional.h"
-#include "mojo/public/cpp/bindings/pending_receiver.h"
-#include "mojo/public/cpp/bindings/pending_remote.h"
-#include "mojo/public/cpp/bindings/receiver.h"
-#include "mojo/public/cpp/bindings/remote.h"
-#include "services/network/public/mojom/udp_socket.mojom-blink.h"
-#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
-#include "third_party/blink/renderer/modules/modules_export.h"
-#include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
-#include "third_party/blink/renderer/platform/heap/heap.h"
-#include "third_party/blink/renderer/platform/heap/member.h"
-#include "third_party/blink/renderer/platform/scheduler/public/frame_or_worker_scheduler.h"
-
-namespace net {
-class IPEndPoint;
-}  // namespace net
-
-namespace blink {
-
-class MODULES_EXPORT UDPSocket final
-    : public ScriptWrappable,
-      public network::mojom::blink::UDPSocketListener {
-  DEFINE_WRAPPERTYPEINFO();
-
- public:
-  explicit UDPSocket(ScriptPromiseResolver&);
-  ~UDPSocket() override;
-
-  UDPSocket(const UDPSocket&) = delete;
-  UDPSocket& operator=(const UDPSocket&) = delete;
-
-  // Called by NavigatorSocket when initiating a connection:
-  mojo::PendingReceiver<network::mojom::blink::UDPSocket>
-  GetUDPSocketReceiver();
-  mojo::PendingRemote<network::mojom::blink::UDPSocketListener>
-  GetUDPSocketListener();
-  void Init(int32_t result,
-            const base::Optional<net::IPEndPoint>& local_addr,
-            const base::Optional<net::IPEndPoint>& peer_addr);
-
-  // Web-exposed function
-  ScriptPromise close(ScriptState*, ExceptionState&);
-
-  // network::mojom::blink::UDPSocketListener:
-  void OnReceived(int32_t result,
-                  const base::Optional<::net::IPEndPoint>& src_addr,
-                  base::Optional<::base::span<const ::uint8_t>> data) override;
-
-  // ScriptWrappable:
-  void Trace(Visitor* visitor) const override;
-
- private:
-  void OnSocketListenerConnectionError();
-
-  Member<ScriptPromiseResolver> resolver_;
-  FrameOrWorkerScheduler::SchedulingAffectingFeatureHandle
-      feature_handle_for_scheduler_;
-
-  mojo::Remote<network::mojom::blink::UDPSocket> udp_socket_;
-  mojo::Receiver<network::mojom::blink::UDPSocketListener>
-      socket_listener_receiver_{this};
-};
-
-}  // namespace blink
-
-#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_DIRECT_SOCKETS_UDP_SOCKET_H_

third_party/blink/renderer/modules/direct_sockets/udp_socket.idl

-// Copyright 2020 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.
-
-// https://github.com/WICG/raw-sockets/blob/master/docs/explainer.md#udp
-
-[
-    Exposed=Window,
-    RuntimeEnabled=DirectSockets,
-    SecureContext
-] interface UDPSocket {
-  // TODO(crbug.com/1119620): Add support for sending, receiving
-  // TODO(crbug.com/1119620): Add measurement
-
-  [RaisesException, CallWith=ScriptState]
-  Promise<void> close();
-};

third_party/blink/renderer/modules/modules_idl_files.gni

@@ -108,6 +108,7 @@ _idl_imports = [
   "//third_party/blink/renderer/modules/presentation/idls.gni",
   "//third_party/blink/renderer/modules/push_messaging/idls.gni",
   "//third_party/blink/renderer/modules/quota/idls.gni",
+  "//third_party/blink/renderer/modules/direct_sockets/idls.gni",
   "//third_party/blink/renderer/modules/remoteplayback/idls.gni",
   "//third_party/blink/renderer/modules/sanitizer_api/idls.gni",
   "//third_party/blink/renderer/modules/scheduler/idls.gni",
@@ -139,10 +140,7 @@ _idl_imports = [
 # TODO(dcheng): For whatever reason, is_android doesn't seem to be defined, even
 # if using import() instead of read_file() in the foreach() loop below...
 if (!is_android) {
-  _idl_imports += [
-    "//third_party/blink/renderer/modules/direct_sockets/idls.gni",
-    "//third_party/blink/renderer/modules/serial/idls.gni",
-  ]
+  _idl_imports += [ "//third_party/blink/renderer/modules/serial/idls.gni" ]
 }
 
 # Do not add IDL files directly to these lists. See _idl_imports above instead

third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt

@@ -8332,10 +8332,6 @@ interface SyncManager
     method constructor
     method getTags
     method register
-interface TCPSocket
-    attribute @@toStringTag
-    method close
-    method constructor
 interface TaskAttributionTiming : PerformanceEntry
     attribute @@toStringTag
     getter containerId
@@ -8596,10 +8592,6 @@ interface TrustedTypePolicyFactory : EventTarget
     method isScript
     method isScriptURL
     setter onbeforecreatepolicy
-interface UDPSocket
-    attribute @@toStringTag
-    method close
-    method constructor
 interface UIEvent : Event
     attribute @@toStringTag
     getter detail

tools/traffic_annotation/summary/annotations.xml

@@ -84,7 +84,6 @@ Refer to README.md for content description and update process.
  <item id="dial_get_app_info" hash_code="15952025" type="0" deprecated="2018-02-27" content_hash_code="90542080" file_path=""/>
  <item id="dial_get_device_description" hash_code="50422598" type="0" deprecated="2018-02-27" content_hash_code="129827780" file_path=""/>
  <item id="dial_url_fetcher" hash_code="41424546" type="0" content_hash_code="129828432" os_list="linux,windows" file_path="chrome/browser/media/router/discovery/dial/dial_url_fetcher.cc"/>
- <item id="direct_sockets" hash_code="32472991" type="0" content_hash_code="22754768" os_list="linux,windows" file_path="third_party/blink/renderer/modules/direct_sockets/navigator_socket.cc"/>
  <item id="dns_over_https" hash_code="79895226" type="0" content_hash_code="45123510" os_list="linux,windows" file_path="net/dns/dns_transaction.cc"/>
  <item id="dns_transaction" hash_code="79227717" type="0" content_hash_code="132206495" os_list="linux,windows" file_path="net/dns/dns_transaction.cc"/>
  <item id="dom_distiller" hash_code="3989826" type="0" content_hash_code="106153970" os_list="linux,windows" file_path="components/dom_distiller/core/distiller_url_fetcher.cc"/>

tools/traffic_annotation/summary/grouping.xml

@@ -150,7 +150,6 @@ hidden="true" so that these annotations don't show up in the document.
       <traffic_annotation unique_id="origin_policy_loader"/>
       <traffic_annotation unique_id="services_http_server_error_response"/>
       <traffic_annotation unique_id="webrtc_peer_connection"/>
-      <traffic_annotation unique_id="direct_sockets"/>
       <traffic_annotation unique_id="floc_id_provider_impl"/>
       <traffic_annotation unique_id="gstatic_change_password_override_urls"/>
       <traffic_annotation unique_id="interest_feedv2_image_send"/>