From e12009df79d26c5ee5043d36187b944de47995c4 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 8272e44182..703762fd17 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" @@ -466,9 +465,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 f67155e5cc..510abd9fe7 100644 --- a/src/net/socket/udp_socket_posix.cc +++ b/src/net/socket/udp_socket_posix.cc @@ -56,7 +56,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" @@ -270,9 +269,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(). See https://crbug.com/1151048.