From 3e7f7c4c52c4d30584ed5d1ef067c5d8833349a9 Mon Sep 17 00:00:00 2001 From: klzgrad Date: Sun, 29 May 2022 19:14:32 +0800 Subject: [PATCH] net: Remove upstream temporary debug code breaking build --- src/net/socket/tcp_socket_posix.cc | 4 ---- src/net/socket/udp_socket_posix.cc | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/net/socket/tcp_socket_posix.cc b/src/net/socket/tcp_socket_posix.cc index 4e7a6edd9c..636cb384bb 100644 --- a/src/net/socket/tcp_socket_posix.cc +++ b/src/net/socket/tcp_socket_posix.cc @@ -43,7 +43,6 @@ #include "net/socket/socket_posix.h" #include "net/socket/socket_tag.h" #include "net/traffic_annotation/network_traffic_annotation.h" -#include "third_party/perfetto/include/perfetto/tracing/string_helpers.h" #if BUILDFLAG(IS_ANDROID) #include "net/android/network_library.h" @@ -464,9 +463,6 @@ void TCPSocketPosix::Close() { // trace event for this case so that it can be correlated with jank in traces. // Use the "base" category since "net" isn't enabled by default. See // https://crbug.com/1194888. - TRACE_EVENT("base", PeerIsZeroIPv4(*this) - ? perfetto::StaticString{"CloseSocketTCP.PeerIsZero"} - : perfetto::StaticString{"CloseSocketTCP"}); #endif // BUILDFLAG(IS_APPLE) && !BUILDFLAG(CRONET_BUILD) socket_.reset(); tag_ = SocketTag(); diff --git a/src/net/socket/udp_socket_posix.cc b/src/net/socket/udp_socket_posix.cc index aad22032b5..685463bc65 100644 --- a/src/net/socket/udp_socket_posix.cc +++ b/src/net/socket/udp_socket_posix.cc @@ -54,7 +54,6 @@ #include "net/socket/socket_tag.h" #include "net/socket/udp_net_log_parameters.h" #include "net/traffic_annotation/network_traffic_annotation.h" -#include "third_party/perfetto/include/perfetto/tracing/string_helpers.h" #if BUILDFLAG(IS_ANDROID) #include "base/native_library.h" @@ -253,9 +252,6 @@ void UDPSocketPosix::Close() { // trace event for this case so that it can be correlated with jank in traces. // Use the "base" category since "net" isn't enabled by default. See // https://crbug.com/1194888. - TRACE_EVENT("base", PeerIsZeroIPv4(*this) - ? perfetto::StaticString{"CloseSocketUDP.PeerIsZero"} - : perfetto::StaticString{"CloseSocketUDP"}); // Attempt to clear errors on the socket so that they are not returned by // close(). This seems to be effective at clearing some, but not all,