From 4e81474df62ba4dc2718166afad02f9487535c58 Mon Sep 17 00:00:00 2001
From: klzgrad <kizdiv@gmail.com>
Date: Mon, 7 Oct 2024 15:57:25 +0800
Subject: [PATCH] base, crypto, net: Fix trace stubs

---
 src/base/trace_event/trace_event_stub.cc | 4 ++++
 src/crypto/process_bound_string.cc       | 2 +-
 src/net/base/trace_event_stub.h          | 6 +++---
 src/net/base/tracing.h                   | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/base/trace_event/trace_event_stub.cc b/src/base/trace_event/trace_event_stub.cc
index f2d65216e4..27ed6ff1d9 100644
--- a/src/base/trace_event/trace_event_stub.cc
+++ b/src/base/trace_event/trace_event_stub.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/trace_event/memory_usage_estimator.h"
 #include "base/trace_event/trace_event_stub.h"
 
 #include <stddef.h>
@@ -20,6 +21,9 @@ MemoryDumpProvider::~MemoryDumpProvider() = default;
 // static
 constexpr const char* const MemoryDumpManager::kTraceCategory;
 
+template size_t EstimateMemoryUsage(const std::string&);
+template size_t EstimateMemoryUsage(const std::u16string&);
+
 }  // namespace trace_event
 }  // namespace base
 
diff --git a/src/crypto/process_bound_string.cc b/src/crypto/process_bound_string.cc
index 2b7ec8e070..60f0f20bb6 100644
--- a/src/crypto/process_bound_string.cc
+++ b/src/crypto/process_bound_string.cc
@@ -13,7 +13,7 @@
 #include <dpapi.h>
 
 #include "base/process/memory.h"
-#include "base/trace_event/trace_event.h"
+#include "base/trace_event/trace_event_stub.h"
 #else
 #include "third_party/boringssl/src/include/openssl/mem.h"
 #endif  // BUILDFLAG(IS_WIN)
diff --git a/src/net/base/trace_event_stub.h b/src/net/base/trace_event_stub.h
index ec3f0a9996..ef08fa533d 100644
--- a/src/net/base/trace_event_stub.h
+++ b/src/net/base/trace_event_stub.h
@@ -12,9 +12,9 @@
 #ifndef NET_BASE_TRACE_EVENT_STUB_H_
 #define NET_BASE_TRACE_EVENT_STUB_H_
 
-#import "base/base_export.h"
-#import "base/memory/weak_ptr.h"
-#import "base/trace_event/trace_event_stub.h"
+#include "base/base_export.h"
+#include "base/memory/weak_ptr.h"
+#include "base/trace_event/trace_event_stub.h"
 
 namespace base::trace_event {
 
diff --git a/src/net/base/tracing.h b/src/net/base/tracing.h
index 31c90ac1b9..8fb0675877 100644
--- a/src/net/base/tracing.h
+++ b/src/net/base/tracing.h
@@ -8,7 +8,7 @@
 #include "build/build_config.h"
 #include "net/base/cronet_buildflags.h"
 
-#if BUILDFLAG(CRONET_BUILD) && !BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(CRONET_BUILD)
 #include "net/base/trace_event_stub.h"  // IWYU pragma: export
 #endif  // BUILDFLAG(CRONET_BUILD) && !BUILDFLAG(IS_APPLE)