mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-11-24 06:16:30 +03:00
Code Issues Projects Releases Wiki Activity

net: Remove upstream temporary debug code breaking build

Browse Source
This commit is contained in:
klzgrad 2022-05-29 19:14:32 +08:00
parent 8eb6cf893b
commit 3e7f7c4c52
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/socket/tcp_socket_posix.cc
View File

@ -43,7 +43,6 @@
#include "net/socket/socket_posix.h" #include "net/socket/socket_posix.h"
#include "net/socket/socket_tag.h" #include "net/socket/socket_tag.h"
#include "net/traffic_annotation/network_traffic_annotation.h" #include "net/traffic_annotation/network_traffic_annotation.h"
#include "third_party/perfetto/include/perfetto/tracing/string_helpers.h"
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
#include "net/android/network_library.h" #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. // 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 // Use the "base" category since "net" isn't enabled by default. See
// https://crbug.com/1194888. // https://crbug.com/1194888.
TRACE_EVENT("base", PeerIsZeroIPv4(*this)
? perfetto::StaticString{"CloseSocketTCP.PeerIsZero"}
: perfetto::StaticString{"CloseSocketTCP"});
#endif // BUILDFLAG(IS_APPLE) && !BUILDFLAG(CRONET_BUILD) #endif // BUILDFLAG(IS_APPLE) && !BUILDFLAG(CRONET_BUILD)
socket_.reset(); socket_.reset();
tag_ = SocketTag(); tag_ = SocketTag();

4
src/net/socket/udp_socket_posix.cc
View File

@ -54,7 +54,6 @@
#include "net/socket/socket_tag.h" #include "net/socket/socket_tag.h"
#include "net/socket/udp_net_log_parameters.h" #include "net/socket/udp_net_log_parameters.h"
#include "net/traffic_annotation/network_traffic_annotation.h" #include "net/traffic_annotation/network_traffic_annotation.h"
#include "third_party/perfetto/include/perfetto/tracing/string_helpers.h"
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
#include "base/native_library.h" #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. // 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 // Use the "base" category since "net" isn't enabled by default. See
// https://crbug.com/1194888. // 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 // 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, // close(). This seems to be effective at clearing some, but not all,