diff --git a/quiche/quic/tools/connect_tunnel_test.cc b/quiche/quic/tools/connect_tunnel_test.cc
index fc4ed40..ed6841b 100644
--- a/quiche/quic/tools/connect_tunnel_test.cc
+++ b/quiche/quic/tools/connect_tunnel_test.cc
@@ -136,9 +136,9 @@
 TEST_F(ConnectTunnelTest, OpenTunnel) {
   EXPECT_CALL(*socket_, ConnectBlocking()).WillOnce(Return(absl::OkStatus()));
   EXPECT_CALL(*socket_, ReceiveAsync(Gt(0)));
-  EXPECT_CALL(*socket_, Disconnect()).WillOnce(InvokeWithoutArgs([this]() {
+  EXPECT_CALL(*socket_, Disconnect()).WillOnce([this]() {
     tunnel_.ReceiveComplete(absl::CancelledError());
-  }));
+  });
 
   quiche::HttpHeaderBlock expected_response_headers;
   expected_response_headers[":status"] = "200";
@@ -168,9 +168,9 @@
 TEST_F(ConnectTunnelTest, OpenTunnelToIpv4LiteralDestination) {
   EXPECT_CALL(*socket_, ConnectBlocking()).WillOnce(Return(absl::OkStatus()));
   EXPECT_CALL(*socket_, ReceiveAsync(Gt(0)));
-  EXPECT_CALL(*socket_, Disconnect()).WillOnce(InvokeWithoutArgs([this]() {
+  EXPECT_CALL(*socket_, Disconnect()).WillOnce([this]() {
     tunnel_.ReceiveComplete(absl::CancelledError());
-  }));
+  });
 
   quiche::HttpHeaderBlock expected_response_headers;
   expected_response_headers[":status"] = "200";
@@ -200,9 +200,9 @@
 TEST_F(ConnectTunnelTest, OpenTunnelToIpv6LiteralDestination) {
   EXPECT_CALL(*socket_, ConnectBlocking()).WillOnce(Return(absl::OkStatus()));
   EXPECT_CALL(*socket_, ReceiveAsync(Gt(0)));
-  EXPECT_CALL(*socket_, Disconnect()).WillOnce(InvokeWithoutArgs([this]() {
+  EXPECT_CALL(*socket_, Disconnect()).WillOnce([this]() {
     tunnel_.ReceiveComplete(absl::CancelledError());
-  }));
+  });
 
   quiche::HttpHeaderBlock expected_response_headers;
   expected_response_headers[":status"] = "200";
@@ -265,9 +265,9 @@
 
   EXPECT_CALL(*socket_, ConnectBlocking()).WillOnce(Return(absl::OkStatus()));
   EXPECT_CALL(*socket_, ReceiveAsync(Ge(kData.size()))).Times(2);
-  EXPECT_CALL(*socket_, Disconnect()).WillOnce(InvokeWithoutArgs([this]() {
+  EXPECT_CALL(*socket_, Disconnect()).WillOnce([this]() {
     tunnel_.ReceiveComplete(absl::CancelledError());
-  }));
+  });
 
   EXPECT_CALL(request_handler_, OnResponseBackendComplete(_));
 
@@ -293,9 +293,9 @@
   EXPECT_CALL(*socket_, ReceiveAsync(Gt(0)));
   EXPECT_CALL(*socket_, SendBlocking(Matcher<std::string>(Eq(kData))))
       .WillOnce(Return(absl::OkStatus()));
-  EXPECT_CALL(*socket_, Disconnect()).WillOnce(InvokeWithoutArgs([this]() {
+  EXPECT_CALL(*socket_, Disconnect()).WillOnce([this]() {
     tunnel_.ReceiveComplete(absl::CancelledError());
-  }));
+  });
 
   EXPECT_CALL(request_handler_, OnResponseBackendComplete(_));
 
diff --git a/quiche/quic/tools/connect_udp_tunnel_test.cc b/quiche/quic/tools/connect_udp_tunnel_test.cc
index 38e7755..49375d9 100644
--- a/quiche/quic/tools/connect_udp_tunnel_test.cc
+++ b/quiche/quic/tools/connect_udp_tunnel_test.cc
@@ -158,9 +158,9 @@
 TEST_F(ConnectUdpTunnelTest, OpenTunnel) {
   EXPECT_CALL(*socket_, ConnectBlocking()).WillOnce(Return(absl::OkStatus()));
   EXPECT_CALL(*socket_, ReceiveAsync(Gt(0)));
-  EXPECT_CALL(*socket_, Disconnect()).WillOnce(InvokeWithoutArgs([this]() {
+  EXPECT_CALL(*socket_, Disconnect()).WillOnce([this]() {
     tunnel_.ReceiveComplete(absl::CancelledError());
-  }));
+  });
 
   EXPECT_CALL(
       request_handler_,
@@ -190,9 +190,9 @@
 TEST_F(ConnectUdpTunnelTest, OpenTunnelToIpv4LiteralTarget) {
   EXPECT_CALL(*socket_, ConnectBlocking()).WillOnce(Return(absl::OkStatus()));
   EXPECT_CALL(*socket_, ReceiveAsync(Gt(0)));
-  EXPECT_CALL(*socket_, Disconnect()).WillOnce(InvokeWithoutArgs([this]() {
+  EXPECT_CALL(*socket_, Disconnect()).WillOnce([this]() {
     tunnel_.ReceiveComplete(absl::CancelledError());
-  }));
+  });
 
   EXPECT_CALL(
       request_handler_,
@@ -223,9 +223,9 @@
 TEST_F(ConnectUdpTunnelTest, OpenTunnelToIpv6LiteralTarget) {
   EXPECT_CALL(*socket_, ConnectBlocking()).WillOnce(Return(absl::OkStatus()));
   EXPECT_CALL(*socket_, ReceiveAsync(Gt(0)));
-  EXPECT_CALL(*socket_, Disconnect()).WillOnce(InvokeWithoutArgs([this]() {
+  EXPECT_CALL(*socket_, Disconnect()).WillOnce([this]() {
     tunnel_.ReceiveComplete(absl::CancelledError());
-  }));
+  });
 
   EXPECT_CALL(
       request_handler_,
@@ -305,9 +305,9 @@
 
   EXPECT_CALL(*socket_, ConnectBlocking()).WillOnce(Return(absl::OkStatus()));
   EXPECT_CALL(*socket_, ReceiveAsync(Ge(kData.size()))).Times(2);
-  EXPECT_CALL(*socket_, Disconnect()).WillOnce(InvokeWithoutArgs([this]() {
+  EXPECT_CALL(*socket_, Disconnect()).WillOnce([this]() {
     tunnel_.ReceiveComplete(absl::CancelledError());
-  }));
+  });
 
   EXPECT_CALL(request_handler_, OnResponseBackendComplete(_));
 
@@ -340,9 +340,9 @@
   EXPECT_CALL(*socket_, ReceiveAsync(Gt(0)));
   EXPECT_CALL(*socket_, SendBlocking(Matcher<std::string>(Eq(kData))))
       .WillOnce(Return(absl::OkStatus()));
-  EXPECT_CALL(*socket_, Disconnect()).WillOnce(InvokeWithoutArgs([this]() {
+  EXPECT_CALL(*socket_, Disconnect()).WillOnce([this]() {
     tunnel_.ReceiveComplete(absl::CancelledError());
-  }));
+  });
 
   EXPECT_CALL(request_handler_, OnResponseBackendComplete(_));