1 files changed, 12 insertions, 2 deletions
diff --git a/chromium/base/test/test_suite.h b/chromium/base/test/test_suite.h
index 372c5f58a8a..ffad1c77d8b 100644
--- a/chromium/base/test/test_suite.h
+++ b/chromium/base/test/test_suite.h
@@ -13,11 +13,19 @@
 #include <string>
 
 #include "base/at_exit.h"
-#include "base/logging.h"
+#include "base/check.h"
 #include "base/macros.h"
-#include "base/test/trace_to_file.h"
+#include "base/tracing_buildflags.h"
 #include "build/build_config.h"
 
+#if BUILDFLAG(ENABLE_BASE_TRACING)
+#include "base/test/trace_to_file.h"
+#endif  // BUILDFLAG(ENABLE_BASE_TRACING)
+
+namespace logging {
+class ScopedLogAssertHandler;
+}
+
 namespace testing {
 class TestInfo;
 }
@@ -88,7 +96,9 @@ class TestSuite {
   // Basic initialization for the test suite happens here.
   void PreInitialize();
 
+#if BUILDFLAG(ENABLE_BASE_TRACING)
   test::TraceToFile trace_to_file_;
+#endif  // BUILDFLAG(ENABLE_BASE_TRACING)
 
   bool initialized_command_line_ = false;