Support target_network in ClientSocketFactory and related classes [chromium/src : main]

[Adam Rice (Gerrit)]

Attention needed from Stefano Duo

Adam Rice added 3 comments

Patchset-level comments

File-level comment, Patchset 40 (Latest):

Adam Rice . resolved

I'm having a confusing issue where I cannot see the change to net/socket/tcp_client_socket.cc even though I know there must be one. Maybe a Gerrit bug? Here's a couple of comments to be going along with.

File chrome/test/chromedriver/net/adb_client_socket.cc

Line 511, Patchset 40 (Latest): /* socket_performance_watcher= */ nullptr,

Adam Rice . unresolved

Nit, no need to fix: the style doesn't actually include spaces, so 
```suggestion
      /*socket_performance_watcher=*/ nullptr,
```

https://google.github.io/styleguide/cppguide.html#Function_Argument_Comments (can't find a better reference right now)

File net/dns/address_sorter_posix.h

Line 103, Patchset 40 (Latest):

Adam Rice . unresolved

You will need to modify the type of CacheKey when you rebase this.

Open in Gerrit

Related details

Attention is currently required from:

• Stefano Duo

Submit Requirements:

• Code-Coverage
• Code-Owners
• Code-Review
• No-Unresolved-Comments
• Review-Enforcement

Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings.

Gerrit

Gerrit-MessageType: comment

Gerrit-Project: chromium/src

Gerrit-Branch: main

Gerrit-Change-Id: Ib2aa9a595b81063ea4e6e20f269b45d709c983f8

Gerrit-Change-Number: 7612173

Gerrit-PatchSet: 40

Gerrit-Owner: Stefano Duo <stefa...@google.com>

Gerrit-Reviewer: Adam Rice <ri...@chromium.org>

Gerrit-Reviewer: Stefano Duo <stefa...@google.com>

Gerrit-CC: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>

Gerrit-CC: Code Review Nudger <android-build...@prod.google.com>

Gerrit-CC: android-bu...@system.gserviceaccount.com <android-bu...@system.gserviceaccount.com>

Gerrit-Attention: Stefano Duo <stefa...@google.com>

Gerrit-Comment-Date: Mon, 22 Jun 2026 10:36:04 +0000

Gerrit-HasComments: Yes

Gerrit-Has-Labels: No

[Stefano Duo (Gerrit)]

Attention needed from Adam Rice

Stefano Duo voted and added 3 comments

Votes added by Stefano Duo

Commit-Queue

+1

3 comments

Patchset-level comments

File-level comment, Patchset 40:

Adam Rice . resolved

I'm having a confusing issue where I cannot see the change to net/socket/tcp_client_socket.cc even though I know there must be one. Maybe a Gerrit bug? Here's a couple of comments to be going along with.

Stefano Duo

I'm relying on the pre-existing code in [TCPClientSocket](https://source.chromium.org/chromium/chromium/src/+/main:net/socket/tcp_client_socket.h;l=65;drc=a8be8b790f49830fbd8ee5edc7c72ba45f3d1e21) and [UDPClientSocket](https://source.chromium.org/chromium/chromium/src/+/main:net/socket/udp_client_socket.h;l=31;drc=a8be8b790f49830fbd8ee5edc7c72ba45f3d1e21)

File chrome/test/chromedriver/net/adb_client_socket.cc

Line 511, Patchset 40: /* socket_performance_watcher= */ nullptr,

Adam Rice . resolved

Nit, no need to fix: the style doesn't actually include spaces, so 
```suggestion
      /*socket_performance_watcher=*/ nullptr,
```

https://google.github.io/styleguide/cppguide.html#Function_Argument_Comments (can't find a better reference right now)

Stefano Duo

Done

File net/dns/address_sorter_posix.h

Line 103, Patchset 40:

Adam Rice . resolved

You will need to modify the type of CacheKey when you rebase this.

Stefano Duo

Done

Open in Gerrit

Related details

Attention is currently required from:

• Adam Rice

Submit Requirements:

• Code-Coverage
• Code-Owners
• Code-Review

• Review-Enforcement

Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings.

Gerrit

Gerrit-MessageType: comment

Gerrit-Project: chromium/src

Gerrit-Branch: main

Gerrit-Change-Id: Ib2aa9a595b81063ea4e6e20f269b45d709c983f8

Gerrit-Change-Number: 7612173

Gerrit-PatchSet: 43

Gerrit-Owner: Stefano Duo <stefa...@google.com>

Gerrit-Reviewer: Adam Rice <ri...@chromium.org>

Gerrit-Reviewer: Stefano Duo <stefa...@google.com>

Gerrit-CC: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>

Gerrit-CC: Code Review Nudger <android-build...@prod.google.com>

Gerrit-CC: android-bu...@system.gserviceaccount.com <android-bu...@system.gserviceaccount.com>

Gerrit-Attention: Adam Rice <ri...@chromium.org>

Gerrit-Comment-Date: Mon, 22 Jun 2026 14:28:01 +0000

Gerrit-HasComments: Yes

Gerrit-Has-Labels: Yes

Comment-In-Reply-To: Adam Rice <ri...@chromium.org>

[Adam Rice (Gerrit)]

Attention needed from Adam Rice

Adam Rice voted and added 2 comments

Votes added by Adam Rice

Code-Review

+1

2 comments

Patchset-level comments

File-level comment, Patchset 42:

Adam Rice . resolved

lgtm, wow, thanks for the extra AddressSorterPosix unit tests! I obviously didn't look hard enough for a way to test the caching in isolation.

File net/dns/address_sorter_posix.h

Line 103, Patchset 40:

Adam Rice . resolved

You will need to modify the type of CacheKey when you rebase this.

Adam Rice

Done

Open in Gerrit

Related details

Attention is currently required from:

• Adam Rice

Submit Requirements:

• Code-Coverage
• Code-Owners

• Code-Review
• Review-Enforcement

Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings.

Gerrit

Gerrit-MessageType: comment

Gerrit-Project: chromium/src

Gerrit-Branch: main

Gerrit-Change-Id: Ib2aa9a595b81063ea4e6e20f269b45d709c983f8

Gerrit-Change-Number: 7612173

Gerrit-PatchSet: 42

Gerrit-Owner: Stefano Duo <stefa...@google.com>

Gerrit-Reviewer: Adam Rice <ri...@chromium.org>

Gerrit-Reviewer: Stefano Duo <stefa...@google.com>

Gerrit-CC: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>

Gerrit-CC: Code Review Nudger <android-build...@prod.google.com>

Gerrit-CC: android-bu...@system.gserviceaccount.com <android-bu...@system.gserviceaccount.com>

Gerrit-Attention: Adam Rice <ri...@chromium.org>

Gerrit-Comment-Date: Mon, 22 Jun 2026 14:30:50 +0000

[Stefano Duo (Gerrit)]

Attention needed from Adam Rice and Andrew Grieve

Stefano Duo voted and added 1 comment

Votes added by Stefano Duo

Commit-Queue

+1

1 comment

Patchset-level comments

File-level comment, Patchset 45 (Latest):

Stefano Duo . resolved

Andrew, could you Owners-Override the mechanical changes in chrome/ and components/? This CL is changing a socket-related API in //net.

Open in Gerrit

Related details

Attention is currently required from:

• Adam Rice
• Andrew Grieve

Submit Requirements:

• Code-Coverage
• Code-Owners
• Code-Review
• Review-Enforcement

Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings.

Gerrit

Gerrit-MessageType: comment

Gerrit-Project: chromium/src

Gerrit-Branch: main

Gerrit-Change-Id: Ib2aa9a595b81063ea4e6e20f269b45d709c983f8

Gerrit-Change-Number: 7612173

Gerrit-PatchSet: 45

Gerrit-Owner: Stefano Duo <stefa...@google.com>

Gerrit-Reviewer: Adam Rice <ri...@chromium.org>

Gerrit-Reviewer: Andrew Grieve <agr...@chromium.org>

Gerrit-Reviewer: Stefano Duo <stefa...@google.com>

Gerrit-CC: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>

Gerrit-CC: Code Review Nudger <android-build...@prod.google.com>

Gerrit-CC: android-bu...@system.gserviceaccount.com <android-bu...@system.gserviceaccount.com>

Gerrit-Attention: Andrew Grieve <agr...@chromium.org>

Gerrit-Attention: Adam Rice <ri...@chromium.org>

Gerrit-Comment-Date: Mon, 22 Jun 2026 15:17:04 +0000

Gerrit-HasComments: Yes

Gerrit-Has-Labels: Yes

[Andrew Grieve (Gerrit)]

Attention needed from Stefano Duo

Andrew Grieve voted and added 1 comment

Votes added by Andrew Grieve

Owners-Override

+1

1 comment

Patchset-level comments

File-level comment, Patchset 45 (Latest):

Andrew Grieve . resolved

OO for refactor

Open in Gerrit

Related details

Attention is currently required from:

• Stefano Duo

Submit Requirements:

• Code-Coverage
• Code-Owners

• Code-Review
• Review-Enforcement

Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings.

Gerrit

Gerrit-MessageType: comment

Gerrit-Project: chromium/src

Gerrit-Branch: main

Gerrit-Change-Id: Ib2aa9a595b81063ea4e6e20f269b45d709c983f8

Gerrit-Change-Number: 7612173

Gerrit-PatchSet: 45

Gerrit-Owner: Stefano Duo <stefa...@google.com>

Gerrit-Reviewer: Adam Rice <ri...@chromium.org>

Gerrit-Reviewer: Andrew Grieve <agr...@chromium.org>

Gerrit-Reviewer: Stefano Duo <stefa...@google.com>

Gerrit-CC: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>

Gerrit-CC: Code Review Nudger <android-build...@prod.google.com>

Gerrit-CC: android-bu...@system.gserviceaccount.com <android-bu...@system.gserviceaccount.com>

Gerrit-Attention: Stefano Duo <stefa...@google.com>

Gerrit-Comment-Date: Mon, 22 Jun 2026 15:19:15 +0000

Gerrit-HasComments: Yes

Gerrit-Has-Labels: Yes

[Stefano Duo (Gerrit)]

Stefano Duo voted Commit-Queue+2

Commit-Queue

+2

Open in Gerrit

Related details

Attention set is empty

Submit Requirements:

• Code-Coverage
• Code-Owners
• Code-Review
• Review-Enforcement

Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings.

Gerrit

Gerrit-MessageType: comment

Gerrit-Project: chromium/src

Gerrit-Branch: main

Gerrit-Change-Id: Ib2aa9a595b81063ea4e6e20f269b45d709c983f8

Gerrit-Change-Number: 7612173

Gerrit-PatchSet: 46

Gerrit-Owner: Stefano Duo <stefa...@google.com>

Gerrit-Reviewer: Adam Rice <ri...@chromium.org>

Gerrit-Reviewer: Andrew Grieve <agr...@chromium.org>

Gerrit-Reviewer: Stefano Duo <stefa...@google.com>

Gerrit-CC: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>

Gerrit-CC: Code Review Nudger <android-build...@prod.google.com>

Gerrit-CC: android-bu...@system.gserviceaccount.com <android-bu...@system.gserviceaccount.com>

Gerrit-Comment-Date: Tue, 23 Jun 2026 08:22:10 +0000

Gerrit-HasComments: No

Gerrit-Has-Labels: Yes

[Stefano Duo (Gerrit)]

Gerrit-Comment-Date: Tue, 23 Jun 2026 08:54:41 +0000

Gerrit-HasComments: No

Gerrit-Has-Labels: Yes

[Chromium LUCI CQ (Gerrit)]

Chromium LUCI CQ submitted the change with unreviewed changes

Unreviewed changes

42 is the latest approved patch-set.
The change was submitted with unreviewed changes in the following files:

```
The name of the file: net/dns/address_sorter_posix_unittest.cc
Insertions: 9, Deletions: 12.

@@ -816,12 +816,11 @@
 
 TEST_F(AddressSorterPosixCacheTest, StatePartitioningByTargetNetwork) {
   size_t socket_create_count = 0;
-  raw_ptr<TestUDPClientSocket> last_created_socket = nullptr;
-  SetSocketCreateCallback(
-      base::BindLambdaForTesting([&socket_create_count, &last_created_socket](
-                                     TestUDPClientSocket* socket) {
+  handles::NetworkHandle last_bound_network = handles::kInvalidNetworkHandle;
+  SetSocketCreateCallback(base::BindLambdaForTesting(
+      [&socket_create_count, &last_bound_network](TestUDPClientSocket* socket) {
         socket_create_count++;
-        last_created_socket = socket;
+        last_bound_network = socket->GetBoundNetwork();
       }));
 
   AddMapping("10.0.0.1", "10.0.0.10");
@@ -838,14 +837,13 @@
                                  callback.callback()));
     callback.WaitForResult();
     EXPECT_EQ(socket_create_count, 1u);
-    ASSERT_TRUE(last_created_socket);
-    EXPECT_EQ(last_created_socket->GetBoundNetwork(), network_a);
+    EXPECT_EQ(last_bound_network, network_a);
   }
 
   // Second sort with network_b should miss cache.
   {
     socket_create_count = 0;
-    last_created_socket = nullptr;
+    last_bound_network = handles::kInvalidNetworkHandle;
     std::vector<IPEndPoint> sorted;
     TestCompletionCallback callback;
     sorter_->Sort({endpoint}, NetworkAnonymizationKey(), network_b,
@@ -853,14 +851,13 @@
                                  callback.callback()));
     callback.WaitForResult();
     EXPECT_EQ(socket_create_count, 1u);
-    ASSERT_TRUE(last_created_socket);
-    EXPECT_EQ(last_created_socket->GetBoundNetwork(), network_b);
+    EXPECT_EQ(last_bound_network, network_b);
   }
 
   // Third sort with network_a should hit cache.
   {
     socket_create_count = 0;
-    last_created_socket = nullptr;
+    last_bound_network = handles::kInvalidNetworkHandle;
     std::vector<IPEndPoint> sorted;
     TestCompletionCallback callback;
     sorter_->Sort({endpoint}, NetworkAnonymizationKey(), network_a,
@@ -868,7 +865,7 @@
                                  callback.callback()));
     callback.WaitForResult();
     EXPECT_EQ(socket_create_count, 0u);
-    EXPECT_FALSE(last_created_socket);
+    EXPECT_EQ(last_bound_network, handles::kInvalidNetworkHandle);
   }
 }
 
```
```
The name of the file: net/dns/host_resolver_manager.h
Insertions: 1, Deletions: 1.

@@ -492,7 +492,7 @@
   // ERR_IO_PENDING if it will be asynchronous.
   virtual int StartGloballyReachableCheck(
       const IPAddress& dest,
-      handles::NetworkHandle network,
+      handles::NetworkHandle target_network,
       const NetLogWithSource& net_log,
       ClientSocketFactory* client_socket_factory,
       CompletionOnceCallback callback);
```
```
The name of the file: net/quic/quic_session_pool.h
Insertions: 1, Deletions: 2.

@@ -698,10 +698,9 @@
       MultiplexedSessionCreationInitiator session_creation_initiator,
       std::optional<ConnectionManagementConfig> connection_management_config,
       int rv);
-  base::expected<QuicSessionAttempt::CreateSessionResult, int>
-
   // TODO(crbug.com/518753285): Stop accepting a `network` parameter. Instead,
   // rely on socket being already bound to the correct network.
+  base::expected<QuicSessionAttempt::CreateSessionResult, int>
   CreateSessionHelper(
       QuicSessionAliasKey key,
       quic::ParsedQuicVersion quic_version,
```
```
The name of the file: net/socket/tcp_client_socket.h
Insertions: 1, Deletions: 1.

@@ -64,7 +64,7 @@
       NetworkQualityEstimator* network_quality_estimator,
       net::NetLog* net_log,
       const net::NetLogSource& source,
-      handles::NetworkHandle target_network);
+      handles::NetworkHandle network);
 
   // Adopts the given, connected socket and then acts as if Connect() had been
   // called. This function is used by TCPServerSocket and for testing.
```

Change information

Commit message:

Support target_network in ClientSocketFactory and related classes

This CL performs the last bit of plumbing necessary to perform
multi-networking in Chrome. More precisely, it:

1. Adds target_network to the ClientSocketFactory interface. This is
   then just passed onto the pre-existing multi-networking code at the
   socket layer (the one used by Cronet and multi-network CCT).
2. Updates calls into ClientSocketFactory (and sockets directly) to
   pass a proper target network. This is usually fetched from some
   key (be it a SpdySessionKey, QuicSessionKey, or DNS's JobKey)
3. Documents as not supported (for now), the network service APIs that
   directly interact with sockets, bypassing URLLoaderFactories.

Two pieces of code are particularly tricky and will be fixed further
separately:
1. QUIC's handling of sockets. When connection migration is enabled,
   QUIC sockets get already bound to a network. The way this is
   currently performed does not match how multi-networking binds its
   socket. Follow-up CLs will refactor connection's migration network
   binding and disable connection migration for connections bound to
   a network.
   This is tracked at https://crbug.com/518753285.
2. IPv6 connectivity checks. The "cache" within HostResolverManager
   needs to become partitioned by network.
   This is tracked at https://crbug.com/519138300.

As per testing, this covers the following:
1. Behavior of IPv6 connectivity checks when targeting a network and not
2. AddressSorter correctly receiving and propagating the target network
3. ClientSocketPool correctly partitioning by target network

Note: this does not need to modify the actual socket's code, we can just
rely on the previous multi-network work done for Cronet.

Bug: 495684670, 519138300, 518753285

Change-Id: Ib2aa9a595b81063ea4e6e20f269b45d709c983f8

Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7612173

Commit-Queue: Stefano Duo <stefa...@google.com>

Reviewed-by: Adam Rice <ri...@chromium.org>

Owners-Override: Andrew Grieve <agr...@chromium.org>

Cr-Commit-Position: refs/heads/main@{#1650856}

Files:

• M chrome/browser/autofill/captured_sites_test_utils.cc
• M chrome/browser/devtools/device/adb/adb_client_socket.cc
• M chrome/browser/devtools/device/port_forwarding_controller.cc
• M chrome/browser/devtools/device/tcp_device_provider.cc
• M chrome/browser/extensions/api/socket/tcp_socket_unittest.cc
• M chrome/services/sharing/nearby/platform/wifi_direct_server_socket_unittest.cc
• M chrome/test/chromedriver/net/adb_client_socket.cc
• M chrome/test/chromedriver/net/websocket.cc
• M components/media_router/common/providers/cast/channel/cast_socket_unittest.cc
• M components/ui_devtools/devtools_server_unittest.cc
• M components/webrtc/fake_ssl_client_socket_unittest.cc
• M net/dns/address_sorter.h
• M net/dns/address_sorter_posix.cc
• M net/dns/address_sorter_posix.h
• M net/dns/address_sorter_posix_unittest.cc
• M net/dns/address_sorter_unittest.cc
• M net/dns/address_sorter_win.cc
• M net/dns/dns_client_unittest.cc
• M net/dns/dns_test_util.cc
• M net/dns/dns_transaction.cc
• M net/dns/dns_transaction_unittest.cc
• M net/dns/fuzzed_host_resolver_util.cc
• M net/dns/host_resolver_dns_task.cc
• M net/dns/host_resolver_dns_task_unittest.cc
• M net/dns/host_resolver_manager.cc
• M net/dns/host_resolver_manager.h
• M net/dns/host_resolver_manager_request_impl.cc
• M net/dns/host_resolver_manager_service_endpoint_request_impl.cc
• M net/dns/host_resolver_manager_unittest.cc
• M net/dns/host_resolver_manager_unittest.h
• M net/dns/host_resolver_service_endpoint_request_unittest.cc
• M net/http/http_stream_factory_job_controller_unittest.cc
• M net/quic/dedicated_web_transport_http3_client.cc
• M net/quic/quic_chromium_client_session.cc
• M net/quic/quic_chromium_client_session.h
• M net/quic/quic_chromium_client_session_test.cc
• M net/quic/quic_session_pool.cc
• M net/quic/quic_session_pool.h
• M net/quic/quic_session_pool_test.cc
• M net/quic/quic_socket_data_provider_unittest.cc
• M net/server/http_server_unittest.cc
• M net/socket/client_socket_factory.cc
• M net/socket/client_socket_factory.h
• M net/socket/client_socket_pool_base_unittest.cc
• M net/socket/fuzzed_socket_factory.cc
• M net/socket/fuzzed_socket_factory.h
• M net/socket/network_binding_client_socket_factory.cc
• M net/socket/network_binding_client_socket_factory.h
• M net/socket/sequenced_socket_data_unittest.cc
• M net/socket/socket_bio_adapter_unittest.cc
• M net/socket/socket_test_util.cc
• M net/socket/socket_test_util.h
• M net/socket/ssl_client_socket_unittest.cc
• M net/socket/tcp_client_socket.h
• M net/socket/tcp_client_socket_unittest.cc
• M net/socket/tcp_connect_job_connector.cc
• M net/socket/tcp_server_socket_unittest.cc
• M net/socket/tcp_socket_unittest.cc
• M net/socket/tcp_stream_attempt.cc
• M net/socket/transport_client_socket_pool_test_util.cc
• M net/socket/transport_client_socket_pool_test_util.h
• M net/socket/transport_client_socket_unittest.cc
• M net/socket/transport_connect_sub_job.cc
• M net/socket/udp_client_socket.cc
• M net/socket/udp_client_socket.h
• M net/socket/udp_socket_perftest.cc
• M net/socket/udp_socket_unittest.cc
• M net/spdy/spdy_session_unittest.cc
• M net/test/embedded_test_server/embedded_test_server_unittest.cc
• M net/test/embedded_test_server/http_connect_proxy_handler.cc
• M net/tools/quic/quic_client_message_loop_network_helper.cc
• M remoting/protocol/stream_packet_socket.cc
• M services/network/brokered_client_socket_factory.cc
• M services/network/brokered_client_socket_factory.h
• M services/network/brokered_tcp_client_socket_unittest.cc
• M services/network/brokered_udp_client_socket_unittest.cc
• M services/network/p2p/socket_manager.cc
• M services/network/proxy_auto_config_library.cc
• M services/network/proxy_auto_config_library_unittest.cc
• M services/network/socket_data_pump_unittest.cc
• M services/network/tcp_connected_socket.cc

Change size: XL

Delta: 81 files changed, 1220 insertions(+), 315 deletions(-)

Branch: refs/heads/main

Submit Requirements:

• Code-Review: +1 by Adam Rice

Open in Gerrit

Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings.

Gerrit

Gerrit-MessageType: merged

Gerrit-Project: chromium/src

Gerrit-Branch: main

Gerrit-Change-Id: Ib2aa9a595b81063ea4e6e20f269b45d709c983f8

Gerrit-Change-Number: 7612173

Gerrit-PatchSet: 47

Gerrit-Owner: Stefano Duo <stefa...@google.com>

Gerrit-Reviewer: Adam Rice <ri...@chromium.org>

Gerrit-Reviewer: Andrew Grieve <agr...@chromium.org>

Gerrit-Reviewer: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>

Gerrit-Reviewer: Stefano Duo <stefa...@google.com>