Revert "Use string_view in logging and trace_event location"

This reverts commit 5439f8eb1e.

Reason for revert: Causing CQ failure:
https://ci.chromium.org/ui/p/chromium/builders/ci/Libfuzzer%20Upload%20Chrome%20OS%20ASan/120721/overview

Step compile failed. Error logs are shown below:
[72328/76374] CXX obj/chrome/browser/ash/policy/remote_commands/policy_remote_commands_fuzzer/remote_commands_fuzzer.o
../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/chrome/browser/ash/policy/remote_commands/policy_remote_commands_fuzzer/...(too long)
../../chrome/browser/ash/policy/remote_commands/remote_commands_fuzzer.cc:56:35: error: cannot initialize a parameter of type 'LogMessageHandlerFunction' (aka 'bool (*)(int, basic_string_view<char>, int, unsigned long, const basic_string<char> &)') with an rvalue of type 'bool (*)(int, const char *, int, size_t, const std::string &)' (aka 'bool (*)(int, const char *, int, unsigned long, const basic_string<char> &)'): type mismatch at 2nd parameter ('std::string_view' (aka 'basic_string_view<char>') vs 'const char *')
   56 |     logging::SetLogMessageHandler(&VoidifyingLogHandler);
      |                                   ^~~~~~~~~~~~~~~~~~~~~

Original change's description:
> Use string_view in logging and trace_event location
>
> Changes the LogMessage class to use a string_view for file names. This
> required a matching change in trace_event: a const char* string was
> passed from logging code, but there is no safe way to get a const
> char* from a string_view since the latter may not be null-terminated.
>
> Many clients of base/logging.h are updated to use string_view as well.
>
> Code which attempts to pass a string_view to a LogMessage by its data
> pointer already exists:
> https://source.chromium.org/chromium/chromium/src/+/main:ash/quick_pair/common/logging.cc;l=49;drc=c6c99d03b1d2f4fab91d6be8665f81b540690c73
> https://source.chromium.org/chromium/chromium/src/+/main:components/cross_device/logging/logging.cc;l=30;drc=00704dbac4f63b2476aac319572ffc42c9b71fc2
>
> Desire for Rust logging support prompted this change. In principle a
> Rust log facility can be a thin wrapper around the base logging
> implementation, but Rust has almost no support for null-terminated
> strings. Instead, Rust provides a string_view equivalent built in to
> the language. This change enables Rust code to pass file names
> obtained by language-specific macros to the C++ implementation.
>
> Bug: None
> Change-Id: I21b4f1c945b70d54f66d80adf3dcda1fe5a39f71
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5765705
> Reviewed-by: Peter Boström <pbos@chromium.org>
> Auto-Submit: Collin Baker <collinbaker@chromium.org>
> Commit-Queue: Collin Baker <collinbaker@chromium.org>
> Reviewed-by: Stephen Nusko <nuskos@chromium.org>
> Reviewed-by: Daniel Cheng <dcheng@chromium.org>
> Owners-Override: Daniel Cheng <dcheng@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1436283}

Bug: None
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Ic5ea70ca431742aac41c270e99937710413f0fd8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6383699
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Fred Shih <ffred@chromium.org>
Commit-Queue: Fred Shih <ffred@chromium.org>
Owners-Override: Fred Shih <ffred@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1436375}

ash/quick_pair/common/logging.cc

@@ -34,20 +34,19 @@ ScopedLogMessage::~ScopedLogMessage() {
     return;
 
   const std::string string_from_stream = stream_.str();
-  LogBuffer::GetInstance()->AddLogMessage(
+  LogBuffer::GetInstance()->AddLogMessage(LogBuffer::LogMessage(
-      LogBuffer::LogMessage(string_from_stream, base::Time::Now(),
+      string_from_stream, base::Time::Now(), file_.data(), line_, severity_));
-                            std::string(file_), line_, severity_));
 
   // Don't emit VERBOSE-level logging to the standard logging system unless
   // verbose logging is enabled for the source file.
   if (severity_ <= logging::LOGGING_VERBOSE &&
-      logging::GetVlogLevelHelper(file_) <= 0) {
+      logging::GetVlogLevelHelper(file_.data(), file_.size()) <= 0) {
     return;
   }
 
   // The destructor of |log_message| also creates a log for the standard logging
   // system.
-  logging::LogMessage log_message(file_, line_, severity_);
+  logging::LogMessage log_message(file_.data(), line_, severity_);
   log_message.stream() << string_from_stream;
 }
 

ash/quick_pair/common/logging.h

@@ -23,10 +23,10 @@ namespace quick_pair {
 // Examples:
 //   QP_LOG(INFO) << "Waiting for " << x << " pending requests.";
 //   QP_LOG(ERROR) << "Request failed: " << error_string;
-#define QP_LOG(severity)                                             \
+#define QP_LOG(severity)                                         \
-  ash::quick_pair::ScopedLogMessage(                                 \
+  ash::quick_pair::ScopedLogMessage(                             \
-      std::string_view(__FILE__, std::size(__FILE__) - 1), __LINE__, \
+      std::string_view(__FILE__, std::size(__FILE__)), __LINE__, \
-      logging::LOGGING_##severity)                                   \
+      logging::LOGGING_##severity)                               \
       .stream()
 
 // Disables all logging while in scope. Intended to be called only from test

ash/quick_pair/common/logging_unittest.cc

@@ -27,7 +27,7 @@ const char kLog4[] = "Unremarkable maple";
 base::LazyInstance<std::vector<std::string>>::DestructorAtExit g_standard_logs =
     LAZY_INSTANCE_INITIALIZER;
 bool HandleStandardLogMessage(int severity,
-                              std::string_view file,
+                              const char* file,
                               int line,
                               size_t message_start,
                               const std::string& str) {

ash/system/input_device_settings/input_device_settings_logging_unittest.cc

@@ -6,8 +6,6 @@
 
 #include <stddef.h>
 
-#include <string_view>
-
 #include "ash/constants/ash_features.h"
 #include "base/no_destructor.h"
 #include "base/test/scoped_feature_list.h"
@@ -28,7 +26,7 @@ std::vector<std::string>& GetStandardLogs() {
 }
 
 bool HandleStandardLogMessage(int severity,
-                              std::string_view file,
+                              const char* file,
                               int line,
                               size_t message_start,
                               const std::string& str) {

base/check_unittest.cc

@@ -112,43 +112,45 @@ MATCHER_P2(LogErrorMatches, line, expected_msg, "") {
     }                                                                          \
   } while (0)
 
-#define EXPECT_LOG_ERROR_WITH_FILENAME(expected_file, expected_line, expr, \
+#define EXPECT_LOG_ERROR_WITH_FILENAME(expected_file, expected_line, expr,     \
-                                       msg)                                \
+                                       msg)                                    \
-  do {                                                                     \
+  do {                                                                         \
-    static bool got_log_message = false;                                   \
+    static bool got_log_message = false;                                       \
-    ASSERT_EQ(logging::GetLogMessageHandler(), nullptr);                   \
+    ASSERT_EQ(logging::GetLogMessageHandler(), nullptr);                       \
-    logging::SetLogMessageHandler([](int severity, std::string_view file,  \
+    logging::SetLogMessageHandler([](int severity, const char* file, int line, \
-                                     int line, size_t message_start,       \
+                                     size_t message_start,                     \
-                                     const std::string& str) {             \
+                                     const std::string& str) {                 \
-      EXPECT_FALSE(got_log_message);                                       \
+      EXPECT_FALSE(got_log_message);                                           \
-      got_log_message = true;                                              \
+      got_log_message = true;                                                  \
-      EXPECT_EQ(severity, logging::LOGGING_ERROR);                         \
+      EXPECT_EQ(severity, logging::LOGGING_ERROR);                             \
-      EXPECT_EQ(str.substr(message_start), (msg));                         \
+      EXPECT_EQ(str.substr(message_start), (msg));                             \
-      EXPECT_EQ(std::string_view(expected_file), file);                    \
+      if (std::string_view(expected_file) != "") {                             \
-      if (expected_line != -1) {                                           \
+        EXPECT_STREQ(expected_file, file);                                     \
-        EXPECT_EQ(expected_line, line);                                    \
+      }                                                                        \
-      }                                                                    \
+      if (expected_line != -1) {                                               \
-      return true;                                                         \
+        EXPECT_EQ(expected_line, line);                                        \
-    });                                                                    \
+      }                                                                        \
-    expr;                                                                  \
+      return true;                                                             \
-    EXPECT_TRUE(got_log_message);                                          \
+    });                                                                        \
-    logging::SetLogMessageHandler(nullptr);                                \
+    expr;                                                                      \
+    EXPECT_TRUE(got_log_message);                                              \
+    logging::SetLogMessageHandler(nullptr);                                    \
   } while (0)
 
 #define EXPECT_LOG_ERROR(expected_line, expr, msg) \
   EXPECT_LOG_ERROR_WITH_FILENAME(__FILE__, expected_line, expr, msg)
 
-#define EXPECT_NO_LOG(expr)                                               \
+#define EXPECT_NO_LOG(expr)                                                    \
-  do {                                                                    \
+  do {                                                                         \
-    ASSERT_EQ(logging::GetLogMessageHandler(), nullptr);                  \
+    ASSERT_EQ(logging::GetLogMessageHandler(), nullptr);                       \
-    logging::SetLogMessageHandler([](int severity, std::string_view file, \
+    logging::SetLogMessageHandler([](int severity, const char* file, int line, \
-                                     int line, size_t message_start,      \
+                                     size_t message_start,                     \
-                                     const std::string& str) {            \
+                                     const std::string& str) {                 \
-      EXPECT_TRUE(false) << "Unexpected log: " << str;                    \
+      EXPECT_TRUE(false) << "Unexpected log: " << str;                         \
-      return true;                                                        \
+      return true;                                                             \
-    });                                                                   \
+    });                                                                        \
-    expr;                                                                 \
+    expr;                                                                      \
-    logging::SetLogMessageHandler(nullptr);                               \
+    logging::SetLogMessageHandler(nullptr);                                    \
   } while (0)
 
 #if defined(OFFICIAL_BUILD)

base/logging.cc

@@ -463,41 +463,33 @@ void SetLogFatalCrashKey(LogMessage* log_message) {
 #endif  // !BUILDFLAG(IS_NACL)
 }
 
-std::string BuildCrashString(std::string_view file,
+std::string BuildCrashString(const char* file,
                              int line,
-                             std::string_view message_without_prefix) {
+                             const char* message_without_prefix) {
   // Only log last path component.
-  char separator =
+  if (file) {
+    const char* slash = UNSAFE_TODO(strrchr(file,
 #if BUILDFLAG(IS_WIN)
-      '\\';
+                                            '\\'
 #else
-      '/';
+                                            '/'
 #endif  // BUILDFLAG(IS_WIN)
-
+                                            ));
-  auto pos = file.rfind(separator);
+    if (slash) {
-  if (pos == std::string_view::npos) {
+      file = UNSAFE_TODO(slash + 1);
-    pos = 0;
+    }
-  } else {
-    pos += 1;
   }
 
-  file = file.substr(pos);
+  return base::StringPrintf("%s:%d: %s", file, line, message_without_prefix);
-
-  return base::StringPrintf("%.*s:%d: %.*s", static_cast<int>(file.length()),
-                            file.data(), line,
-                            static_cast<int>(message_without_prefix.length()),
-                            message_without_prefix.data());
 }
 
 // Invokes macro to record trace event when a log message is emitted.
-void TraceLogMessage(std::string_view file,
+void TraceLogMessage(const char* file, int line, const std::string& message) {
-                     int line,
-                     const std::string& message) {
   TRACE_EVENT_INSTANT("log", "LogMessage", [&](perfetto::EventContext ctx) {
     perfetto::protos::pbzero::LogMessage* log = ctx.event()->set_log_message();
     log->set_source_location_iid(base::trace_event::InternedSourceLocation::Get(
-        &ctx, base::trace_event::TraceSourceLocation(
+        &ctx, base::trace_event::TraceSourceLocation(/*function_name=*/nullptr,
-                  /*function_name=*/std::string_view(), file, line)));
+                                                     file, line)));
     log->set_body_iid(
         base::trace_event::InternedLogMessage::Get(&ctx, message));
   });
@@ -621,11 +613,14 @@ int GetVlogVerbosity() {
   return std::max(-1, LOGGING_INFO - GetMinLogLevel());
 }
 
-int GetVlogLevelHelper(std::string_view file) {
+int GetVlogLevelHelper(const char* file, size_t N) {
+  DCHECK_GT(N, 0U);
+
   // Note: |g_vlog_info| may change on a different thread during startup
   // (but will always be valid or nullptr).
   VlogInfo* vlog_info = GetVlogInfo();
-  return vlog_info ? vlog_info->GetVlogLevel(file) : GetVlogVerbosity();
+  return vlog_info ? vlog_info->GetVlogLevel(std::string_view(file, N - 1))
+                   : GetVlogVerbosity();
 }
 
 void SetLogItems(bool enable_process_id,
@@ -658,7 +653,7 @@ namespace {
   // This simulates a NOTREACHED() at file:line instead of here. This is used
   // instead of base::ImmediateCrash() to give better error messages locally
   // (printed stack for one).
-  LogMessageFatal(std::string_view(file), line, LOGGING_FATAL).stream()
+  LogMessageFatal(file, line, LOGGING_FATAL).stream()
       << "NOTREACHED hit. " << prefix_end;
 }
 
@@ -717,14 +712,11 @@ void DisplayDebugMessageInDialog(const std::string& str) {
 }
 #endif  // !defined(NDEBUG)
 
-LogMessage::LogMessage(std::string_view file, int line, LogSeverity severity)
+LogMessage::LogMessage(const char* file, int line, LogSeverity severity)
     : severity_(severity), file_(file), line_(line) {
   Init(file, line);
 }
 
-LogMessage::LogMessage(const char* file, int line, LogSeverity severity)
-    : LogMessage(std::string_view(file), line, severity) {}
-
 LogMessage::~LogMessage() {
   Flush();
 }
@@ -959,12 +951,12 @@ void LogMessage::Flush() {
 }
 
 std::string LogMessage::BuildCrashString() const {
-  return logging::BuildCrashString(
+  return logging::BuildCrashString(file(), line(),
-      file(), line(), std::string_view(str()).substr(message_start_));
+                                   UNSAFE_TODO(str().c_str() + message_start_));
 }
 
 // writes the common header info to the stream
-void LogMessage::Init(std::string_view file, int line) {
+void LogMessage::Init(const char* file, int line) {
   // Don't let actions from this method affect the system error after returning.
   base::ScopedClearLastError scoped_clear_last_error;
 
@@ -979,14 +971,15 @@ void LogMessage::Init(std::string_view file, int line) {
   // TODO(pbos): Consider migrating LogMessage and the LOG() macros to use
   // base::Location directly. See base/check.h for inspiration.
   const std::string_view filename =
-      file[0] == '.' ? file.substr(std::min(std::size_t{6}, file.length()))
+      file[0] == '.' ? std::string_view(file).substr(
+                           std::min(std::size_t{6}, strlen(file)))
                      : file;
 
 #if BUILDFLAG(IS_CHROMEOS)
   if (g_log_format == LogFormat::LOG_FORMAT_SYSLOG) {
-    InitWithSyslogPrefix(file, line, TickCount(), log_severity_name(severity_),
+    InitWithSyslogPrefix(
-                         g_log_prefix, g_log_process_id, g_log_thread_id,
+        filename, line, TickCount(), log_severity_name(severity_), g_log_prefix,
-                         g_log_timestamp, g_log_tickcount);
+        g_log_process_id, g_log_thread_id, g_log_timestamp, g_log_tickcount);
   } else
 #endif  // BUILDFLAG(IS_CHROMEOS)
   {
@@ -1124,7 +1117,7 @@ BASE_EXPORT std::string SystemErrorCodeToString(SystemErrorCode error_code) {
 }
 
 #if BUILDFLAG(IS_WIN)
-Win32ErrorLogMessage::Win32ErrorLogMessage(std::string_view file,
+Win32ErrorLogMessage::Win32ErrorLogMessage(const char* file,
                                            int line,
                                            LogSeverity severity,
                                            SystemErrorCode err)
@@ -1152,7 +1145,7 @@ Win32ErrorLogMessageFatal::~Win32ErrorLogMessageFatal() {
 }
 
 #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
-ErrnoLogMessage::ErrnoLogMessage(std::string_view file,
+ErrnoLogMessage::ErrnoLogMessage(const char* file,
                                  int line,
                                  LogSeverity severity,
                                  SystemErrorCode err)

base/logging.h

@@ -310,7 +310,8 @@ BASE_EXPORT bool ShouldCreateLogMessage(int severity);
 // Gets the VLOG default verbosity level.
 BASE_EXPORT int GetVlogVerbosity();
 
-BASE_EXPORT int GetVlogLevelHelper(std::string_view file);
+// Note that |N| is the size *with* the null terminator.
+BASE_EXPORT int GetVlogLevelHelper(const char* file_start, size_t N);
 
 // Gets the current vlog level for the given file (usually taken from __FILE__).
 template <size_t N>
@@ -326,7 +327,7 @@ int GetVlogLevel(const char (&file)[N]) {
 #if defined(OFFICIAL_BUILD) && !BUILDFLAG(IS_CHROMEOS)
   return -1;
 #else
-  return GetVlogLevelHelper(std::string_view(file, N - 1));
+  return GetVlogLevelHelper(file, N);
 #endif  // defined(OFFICIAL_BUILD) && !BUILDFLAG(IS_CHROMEOS)
 }
 
@@ -361,7 +362,7 @@ BASE_EXPORT void RegisterAbslAbortHook();
 // however clients can use this function to override with their own handling
 // (e.g. a silent one for Unit Tests)
 using LogAssertHandlerFunction =
-    base::RepeatingCallback<void(std::string_view file,
+    base::RepeatingCallback<void(const char* file,
                                  int line,
                                  std::string_view message,
                                  std::string_view stack_trace)>;
@@ -379,7 +380,7 @@ class BASE_EXPORT ScopedLogAssertHandler {
 // Returns true to signal that it handled the message and the message
 // should not be sent to other log destinations.
 typedef bool (*LogMessageHandlerFunction)(int severity,
-                                          std::string_view file,
+                                          const char* file,
                                           int line,
                                           size_t message_start,
                                           const std::string& str);
@@ -607,21 +608,17 @@ constexpr LogSeverity LOGGING_DCHECK = LOGGING_FATAL;
 // above.
 class BASE_EXPORT LogMessage {
  public:
-  // file must be a static string, such as one obtained from the __FILE__ macro.
-  LogMessage(std::string_view file LIFETIME_BOUND,
-             int line,
-             LogSeverity severity);
-
   LogMessage(const char* file, int line, LogSeverity severity);
 
   LogMessage(const LogMessage&) = delete;
+  LogMessage& operator=(const LogMessage&) = delete;
   virtual ~LogMessage();
 
   std::ostream& stream() { return stream_; }
 
   LogSeverity severity() const { return severity_; }
   std::string str() const { return stream_.str(); }
-  std::string_view file() const { return file_; }
+  const char* file() const { return file_; }
   int line() const { return line_; }
 
   // Gets file:line: message in a format suitable for crash reporting.
@@ -631,7 +628,7 @@ class BASE_EXPORT LogMessage {
   void Flush();
 
  private:
-  void Init(std::string_view file, int line);
+  void Init(const char* file, int line);
 
   void HandleFatal(size_t stack_start, const std::string& str_newline) const;
 
@@ -640,7 +637,7 @@ class BASE_EXPORT LogMessage {
   size_t message_start_;  // Offset of the start of the message (past prefix
                           // info).
   // The file and line information passed in to the constructor.
-  const std::string_view file_;
+  const char* const file_;
   const int line_;
 
 #if BUILDFLAG(IS_CHROMEOS)
@@ -688,7 +685,7 @@ BASE_EXPORT std::string SystemErrorCodeToString(SystemErrorCode error_code);
 // Appends a formatted system message of the GetLastError() type.
 class BASE_EXPORT Win32ErrorLogMessage : public LogMessage {
  public:
-  Win32ErrorLogMessage(std::string_view file LIFETIME_BOUND,
+  Win32ErrorLogMessage(const char* file,
                        int line,
                        LogSeverity severity,
                        SystemErrorCode err);
@@ -715,7 +712,7 @@ class BASE_EXPORT Win32ErrorLogMessageFatal final
 // Appends a formatted system message of the errno type
 class BASE_EXPORT ErrnoLogMessage : public LogMessage {
  public:
-  ErrnoLogMessage(std::string_view file LIFETIME_BOUND,
+  ErrnoLogMessage(const char* file,
                   int line,
                   LogSeverity severity,
                   SystemErrorCode err);

base/logging_unittest.cc

@@ -88,11 +88,9 @@ class MockLogSource {
 
 class MockLogAssertHandler {
  public:
-  MOCK_METHOD4(HandleLogAssert,
+  MOCK_METHOD4(
-               void(std::string_view,
+      HandleLogAssert,
-                    int,
+      void(const char*, int, const std::string_view, const std::string_view));
-                    const std::string_view,
-                    const std::string_view));
 };
 
 TEST_F(LoggingTest, BasicLogging) {
@@ -757,7 +755,7 @@ TEST_F(LoggingTest, LogPrefix) {
   // Use a static because only captureless lambdas can be converted to a
   // function pointer for SetLogMessageHandler().
   static base::NoDestructor<std::string> log_string;
-  SetLogMessageHandler([](int severity, std::string_view file, int line,
+  SetLogMessageHandler([](int severity, const char* file, int line,
                           size_t start, const std::string& str) -> bool {
     *log_string = str;
     return true;
@@ -786,7 +784,7 @@ TEST_F(LoggingTest, LogCrosSyslogFormat) {
   // Use a static because only captureless lambdas can be converted to a
   // function pointer for SetLogMessageHandler().
   static base::NoDestructor<std::string> log_string;
-  SetLogMessageHandler([](int severity, std::string_view file, int line,
+  SetLogMessageHandler([](int severity, const char* file, int line,
                           size_t start, const std::string& str) -> bool {
     *log_string = str;
     return true;
@@ -989,7 +987,7 @@ TEST_F(LoggingTest, CorrectSystemErrorUsed) {
   // Use a static because only captureless lambdas can be converted to a
   // function pointer for SetLogMessageHandler().
   static base::NoDestructor<std::string> log_string;
-  SetLogMessageHandler([](int severity, std::string_view file, int line,
+  SetLogMessageHandler([](int severity, const char* file, int line,
                           size_t start, const std::string& str) -> bool {
     *log_string = str;
     return true;
@@ -1018,7 +1016,7 @@ TEST_F(LoggingTest, BuildTimeVLOG) {
   // Use a static because only captureless lambdas can be converted to a
   // function pointer for SetLogMessageHandler().
   static base::NoDestructor<std::string> log_string;
-  SetLogMessageHandler([](int severity, std::string_view file, int line,
+  SetLogMessageHandler([](int severity, const char* file, int line,
                           size_t start, const std::string& str) -> bool {
     *log_string = str;
     return true;

base/logging_win.cc

@@ -11,8 +11,6 @@
 
 #include <initguid.h>
 
-#include <string_view>
-
 #include "base/memory/singleton.h"
 
 namespace logging {
@@ -41,7 +39,7 @@ LogEventProvider* LogEventProvider::GetInstance() {
 }
 
 bool LogEventProvider::LogMessage(logging::LogSeverity severity,
-                                  std::string_view file,
+                                  const char* file,
                                   int line,
                                   size_t message_start,
                                   const std::string& message) {
@@ -93,6 +91,9 @@ bool LogEventProvider::LogMessage(logging::LogSeverity severity,
     }
 
     EtwMofEvent<5> event(kLogEventId, LOG_MESSAGE_FULL, level);
+    if (file == NULL) {
+      file = "";
+    }
 
     // Add the stack trace.
     event.SetField(0, sizeof(depth), &depth);
@@ -100,7 +101,7 @@ bool LogEventProvider::LogMessage(logging::LogSeverity severity,
     // The line.
     event.SetField(2, sizeof(line), &line);
     // The file.
-    event.SetField(3, file.length(), file.data());
+    event.SetField(3, strlen(file) + 1, file);
     // And finally the message.
     event.SetField(4, message.length() + 1 - message_start,
                    message.c_str() + message_start);

base/logging_win.h

@@ -8,7 +8,6 @@
 #include <stddef.h>
 
 #include <string>
-#include <string_view>
 
 #include "base/base_export.h"
 #include "base/logging.h"
@@ -60,7 +59,7 @@ class BASE_EXPORT LogEventProvider : public base::win::EtwTraceProvider {
   static LogEventProvider* GetInstance();
 
   static bool LogMessage(logging::LogSeverity severity,
-                         std::string_view file,
+                         const char* file,
                          int line,
                          size_t message_start,
                          const std::string& str);

base/test/gtest_xml_unittest_result_printer.cc

@@ -157,7 +157,7 @@ bool XmlUnitTestResultPrinter::Initialize(const FilePath& output_file_path) {
   return true;
 }
 
-void XmlUnitTestResultPrinter::OnAssert(std::string_view file,
+void XmlUnitTestResultPrinter::OnAssert(const char* file,
                                         int line,
                                         const std::string& summary,
                                         const std::string& message) {
@@ -240,7 +240,7 @@ void XmlUnitTestResultPrinter::OnTestSuiteEnd(
 }
 
 void XmlUnitTestResultPrinter::WriteTestPartResult(
-    std::string_view file,
+    const char* file,
     int line,
     testing::TestPartResult::Type result_type,
     const std::string& summary,
@@ -268,12 +268,11 @@ void XmlUnitTestResultPrinter::WriteTestPartResult(
   std::string summary_encoded = base::Base64Encode(summary);
   std::string message_encoded = base::Base64Encode(message);
   fprintf(output_file_.get(),
-          "      <x-test-result-part type=\"%s\" file=\"%.*s\" line=\"%d\">\n"
+          "      <x-test-result-part type=\"%s\" file=\"%s\" line=\"%d\">\n"
           "        <summary>%s</summary>\n"
           "        <message>%s</message>\n"
           "      </x-test-result-part>\n",
-          type, static_cast<int>(file.length()), file.data(), line,
+          type, file, line, summary_encoded.c_str(), message_encoded.c_str());
-          summary_encoded.c_str(), message_encoded.c_str());
   fflush(output_file_);
 }
 

base/test/gtest_xml_unittest_result_printer.h

@@ -51,7 +51,7 @@ class XmlUnitTestResultPrinter : public testing::EmptyTestEventListener {
   [[nodiscard]] bool Initialize(const FilePath& output_file_path);
 
   // CHECK/DCHECK failed. Print file/line and message to the xml.
-  void OnAssert(std::string_view file,
+  void OnAssert(const char* file,
                 int line,
                 const std::string& summary,
                 const std::string& message);
@@ -63,7 +63,7 @@ class XmlUnitTestResultPrinter : public testing::EmptyTestEventListener {
   void OnTestEnd(const testing::TestInfo& test_info) override;
   void OnTestSuiteEnd(const testing::TestSuite& test_suite) override;
 
-  void WriteTestPartResult(std::string_view file,
+  void WriteTestPartResult(const char* file,
                            int line,
                            testing::TestPartResult::Type type,
                            const std::string& summary,

base/test/mock_log.cc

@@ -49,7 +49,7 @@ void MockLog::StopCapturingLogs() {
 
 // static
 bool MockLog::LogMessageHandler(int severity,
-                                std::string_view file,
+                                const char* file,
                                 int line,
                                 size_t message_start,
                                 const std::string& str) {

base/test/mock_log.h

@@ -67,7 +67,7 @@ class MockLog {
   // destinations.
   MOCK_METHOD5(Log,
                bool(int severity,
-                    std::string_view file,
+                    const char* file,
                     int line,
                     size_t message_start,
                     const std::string& str));
@@ -82,7 +82,7 @@ class MockLog {
   // Static function which is set as the logging message handler.
   // Called once for each message.
   static bool LogMessageHandler(int severity,
-                                std::string_view file,
+                                const char* file,
                                 int line,
                                 size_t message_start,
                                 const std::string& str);

base/test/task_environment_unittest.cc

@@ -1573,7 +1573,7 @@ TEST_F(TaskEnvironmentTest, ParallelExecutionFenceNonMainThreadDeath) {
 
 namespace {
 bool FailOnTaskEnvironmentLog(int severity,
-                              std::string_view file,
+                              const char* file,
                               int line,
                               size_t message_start,
                               const std::string& str) {

base/test/test_suite.cc

@@ -444,7 +444,7 @@ void TestSuite::DisableCheckForLeakedGlobals() {
   check_for_leaked_globals_ = false;
 }
 
-void TestSuite::UnitTestAssertHandler(const std::string_view file,
+void TestSuite::UnitTestAssertHandler(const char* file,
                                       int line,
                                       std::string_view summary,
                                       std::string_view stack_trace) {

base/test/test_suite.h

@@ -71,7 +71,7 @@ class TestSuite {
   // By default fatal log messages (e.g. from DCHECKs) result in error dialogs
   // which gum up buildbots. Use a minimalistic assert handler which just
   // terminates the process.
-  void UnitTestAssertHandler(std::string_view file,
+  void UnitTestAssertHandler(const char* file,
                              int line,
                              std::string_view summary,
                              std::string_view stack_trace);

base/trace_event/interned_args_helper.cc

@@ -37,12 +37,11 @@ void InternedSourceLocation::Add(
     const TraceSourceLocation& location) {
   auto* msg = interned_data->add_source_locations();
   msg->set_iid(iid);
-  if (!location.file_name.empty()) {
+  if (location.file_name != nullptr) {
-    msg->set_file_name(location.file_name.data(), location.file_name.length());
+    msg->set_file_name(location.file_name);
   }
-  if (!location.function_name.empty()) {
+  if (location.function_name != nullptr) {
-    msg->set_function_name(location.function_name.data(),
+    msg->set_function_name(location.function_name);
-                           location.function_name.length());
   }
   // TODO(ssid): Add line number once it is allowed in internal proto.
   // TODO(ssid): Add program counter to the proto fields when

base/trace_event/interned_args_helper.h

@@ -7,7 +7,6 @@
 
 #include <optional>
 #include <string>
-#include <string_view>
 
 #include "base/base_export.h"
 #include "base/hash/hash.h"
@@ -26,16 +25,13 @@ namespace trace_event {
 // for log event's location since base::Location uses program counter based
 // location.
 struct BASE_EXPORT TraceSourceLocation {
-  // While these are string_views, only the address is used for equality and
+  const char* function_name = nullptr;
-  // hashing. The length is still needed when interning a new location since the
+  const char* file_name = nullptr;
-  // strings may not be null-terminated.
-  std::string_view function_name;
-  std::string_view file_name;
   int line_number = 0;
 
   TraceSourceLocation() = default;
-  TraceSourceLocation(std::string_view function_name,
+  TraceSourceLocation(const char* function_name,
-                      std::string_view file_name,
+                      const char* file_name,
                       int line_number)
       : function_name(function_name),
         file_name(file_name),
@@ -49,8 +45,8 @@ struct BASE_EXPORT TraceSourceLocation {
         line_number(location.line_number()) {}
 
   bool operator==(const TraceSourceLocation& other) const {
-    return file_name.data() == other.file_name.data() &&
+    return file_name == other.file_name &&
-           function_name.data() == other.function_name.data() &&
+           function_name == other.function_name &&
            line_number == other.line_number;
   }
 };
@@ -80,8 +76,8 @@ struct hash<base::trace_event::TraceSourceLocation> {
   std::size_t operator()(
       const base::trace_event::TraceSourceLocation& loc) const {
     return base::HashInts(
-        base::HashInts(reinterpret_cast<uintptr_t>(loc.file_name.data()),
+        base::HashInts(reinterpret_cast<uintptr_t>(loc.file_name),
-                       reinterpret_cast<uintptr_t>(loc.function_name.data())),
+                       reinterpret_cast<uintptr_t>(loc.function_name)),
         static_cast<size_t>(loc.line_number));
   }
 };

base/trace_event/trace_event_unittest.cc

@@ -20,7 +20,6 @@
 #include <map>
 #include <memory>
 #include <string>
-#include <string_view>
 #include <utility>
 #include <vector>
 
@@ -1640,7 +1639,7 @@ TEST_F(TraceEventTestFixture, ThreadOnceBlocking) {
 
 std::string* g_log_buffer = nullptr;
 bool MockLogMessageHandler(int,
-                           std::string_view,
+                           const char*,
                            int,
                            size_t,
                            const std::string& str) {
@@ -1673,7 +1672,7 @@ TEST_F(TraceEventTestFixture, EchoToConsole) {
 }
 
 bool LogMessageHandlerWithTraceEvent(int,
-                                     std::string_view,
+                                     const char*,
                                      int,
                                      size_t,
                                      const std::string&) {

chrome/browser/ash/scalable_iph/scalable_iph_browsertest.cc

@@ -1150,8 +1150,8 @@ IN_PROC_BROWSER_TEST_F(ScalableIphBrowserTest, Log) {
   // variable as a captureless lambda can be converted to a function pointer.
   static base::NoDestructor<std::vector<std::string>> captured_logs;
   CHECK_EQ(nullptr, logging::GetLogMessageHandler());
-  logging::SetLogMessageHandler([](int severity, std::string_view file,
+  logging::SetLogMessageHandler([](int severity, const char* file, int line,
-                                   int line, size_t message_start,
+                                   size_t message_start,
                                    const std::string& str) {
     captured_logs->push_back(str);
     return true;
@@ -1193,8 +1193,8 @@ IN_PROC_BROWSER_TEST_F(ScalableIphBrowserTestDebugOff, NoLog) {
   // variable as a captureless lambda can be converted to a function pointer.
   static base::NoDestructor<std::vector<std::string>> captured_logs;
   CHECK_EQ(nullptr, logging::GetLogMessageHandler());
-  logging::SetLogMessageHandler([](int severity, std::string_view file,
+  logging::SetLogMessageHandler([](int severity, const char* file, int line,
-                                   int line, size_t message_start,
+                                   size_t message_start,
                                    const std::string& str) {
     captured_logs->push_back(str);
     return true;

chrome/browser/dom_distiller/dom_distiller_service_factory.cc

@@ -9,7 +9,6 @@
 
 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 
-#include <string_view>
 #include <utility>
 
 #include "base/task/sequenced_task_runner.h"
@@ -91,7 +90,8 @@ DomDistillerServiceFactory::BuildServiceInstanceForBrowserContext(
 
   dom_distiller::proto::DomDistillerOptions options;
   if (VLOG_IS_ON(1)) {
-    options.set_debug_level(logging::GetVlogLevelHelper(FROM_HERE.file_name()));
+    options.set_debug_level(logging::GetVlogLevelHelper(
+        FROM_HERE.file_name(), ::strlen(FROM_HERE.file_name())));
   }
   // Options for pagination algorithm:
   // - "next": detect anchors with "next" text

chrome/browser/error_reporting/webui_js_error_reporting_browsertest.cc

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include <memory>
-#include <string_view>
 
 #include "base/containers/contains.h"
 #include "base/test/scoped_feature_list.h"
@@ -108,7 +107,7 @@ class ScopedLogMessageWatcher {
 
  private:
   static bool MessageHandler(int severity,
-                             std::string_view file,
+                             const char* file,
                              int line,
                              size_t message_start,
                              const std::string& str) {

chrome/browser/media/webrtc/webrtc_browsertest_base.cc

@@ -7,7 +7,6 @@
 #include <stddef.h>
 
 #include <limits>
-#include <string_view>
 #include <tuple>
 
 #include "base/json/json_reader.h"
@@ -80,13 +79,12 @@ base::LazyInstance<bool>::DestructorAtExit hit_javascript_errors_ =
 // WebrtcTestBase-inheriting test cases do not run in parallel (if they did they
 // would race to look at the log, which is global to all tests).
 bool JavascriptErrorDetectingLogHandler(int severity,
-                                        std::string_view file,
+                                        const char* file,
                                         int line,
                                         size_t message_start,
                                         const std::string& str) {
-  if (file != "CONSOLE") {
+  if (file == nullptr || std::string("CONSOLE") != file)
     return false;
-  }
 
   // TODO(crbug.com/40608140): Fix AppRTC and stop ignoring this error.
   if (str.find("Synchronous XHR in page dismissal") != std::string::npos)

chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc

@@ -4,8 +4,6 @@
 
 #include <stddef.h>
 
-#include <string_view>
-
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/browser.h"
@@ -32,11 +30,12 @@ namespace {
 static bool had_console_errors = false;
 
 bool HandleMessage(int severity,
-                   std::string_view file,
+                   const char* file,
                    int line,
                    size_t message_start,
                    const std::string& str) {
-  if (severity == logging::LOGGING_ERROR && file == "CONSOLE") {
+  if (severity == logging::LOGGING_ERROR && file &&
+      file == std::string("CONSOLE")) {
     had_console_errors = true;
   }
   return false;

chrome/common/logging_chrome.cc

@@ -110,7 +110,7 @@ const GUID kChromeTraceProviderName = {
 // Assertion handler for logging errors that occur when dialogs are
 // silenced.  To record a new error, pass the log string associated
 // with that error in the str parameter.
-NOINLINE void SilentRuntimeAssertHandler(std::string_view file,
+NOINLINE void SilentRuntimeAssertHandler(const char* file,
                                          int line,
                                          std::string_view message,
                                          std::string_view stack_trace) {

chrome/test/base/ash/web_ui_browser_test.cc

@@ -65,11 +65,12 @@ base::LazyInstance<std::vector<std::string>>::DestructorAtExit
 
 // Intercepts all log messages.
 bool LogHandler(int severity,
-                std::string_view file,
+                const char* file,
                 int line,
                 size_t message_start,
                 const std::string& str) {
-  if (severity == logging::LOGGING_ERROR && file == "CONSOLE") {
+  if (severity == logging::LOGGING_ERROR && file &&
+      std::string("CONSOLE") == file) {
     g_error_messages.Get().push_back(str);
   }
 

chrome/test/chromedriver/logging.cc

@@ -16,7 +16,6 @@
 #include <array>
 #include <cmath>
 #include <memory>
-#include <string_view>
 #include <utility>
 
 #include "base/command_line.h"
@@ -120,7 +119,7 @@ bool InternalIsVLogOn(int vlog_level) {
 }
 
 bool HandleLogMessage(int severity,
-                      std::string_view file,
+                      const char* file,
                       int line,
                       size_t message_start,
                       const std::string& str) {

chromeos/ash/components/multidevice/logging/logging.cc

@@ -34,20 +34,19 @@ ScopedLogMessage::~ScopedLogMessage() {
   const std::string string_from_stream = stream_.str();
   auto* log_buffer = LogBuffer::GetInstance();
   CHECK(log_buffer);
-  log_buffer->AddLogMessage(
+  log_buffer->AddLogMessage(LogBuffer::LogMessage(
-      LogBuffer::LogMessage(string_from_stream, base::Time::Now(),
+      string_from_stream, base::Time::Now(), file_.data(), line_, severity_));
-                            std::string(file_), line_, severity_));
 
   // Don't emit VERBOSE-level logging to the standard logging system unless
   // verbose logging is enabled for the source file.
   if (severity_ <= logging::LOGGING_VERBOSE &&
-      logging::GetVlogLevelHelper(file_) <= 0) {
+      logging::GetVlogLevelHelper(file_.data(), file_.size()) <= 0) {
     return;
   }
 
   // The destructor of |log_message| also creates a log for the standard logging
   // system.
-  logging::LogMessage log_message(file_, line_, severity_);
+  logging::LogMessage log_message(file_.data(), line_, severity_);
   log_message.stream() << string_from_stream;
 }
 

chromeos/ash/components/multidevice/logging/logging.h

@@ -21,10 +21,10 @@ namespace ash::multidevice {
 // Examples:
 //   PA_LOG(INFO) << "Waiting for " << x << " pending requests.";
 //   PA_LOG(ERROR) << "Request failed: " << error_string;
-#define PA_LOG(severity)                                             \
+#define PA_LOG(severity)                                         \
-  ash::multidevice::ScopedLogMessage(                                \
+  ash::multidevice::ScopedLogMessage(                            \
-      std::string_view(__FILE__, std::size(__FILE__) - 1), __LINE__, \
+      std::string_view(__FILE__, std::size(__FILE__)), __LINE__, \
-      logging::LOGGING_##severity)                                   \
+      logging::LOGGING_##severity)                               \
       .stream()
 
 // Disables all logging while in scope. Intended to be called only from test

chromeos/ash/components/multidevice/logging/logging_unittest.cc

@@ -6,8 +6,6 @@
 
 #include <stddef.h>
 
-#include <string_view>
-
 #include "base/lazy_instance.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
@@ -28,7 +26,7 @@ const char kLog4[] = "Unremarkable maple";
 base::LazyInstance<std::vector<std::string>>::DestructorAtExit g_standard_logs =
     LAZY_INSTANCE_INITIALIZER;
 bool HandleStandardLogMessage(int severity,
-                              std::string_view file,
+                              const char* file,
                               int line,
                               size_t message_start,
                               const std::string& str) {

chromeos/ash/components/quick_start/logging.cc

@@ -26,7 +26,7 @@ ScopedLogMessage::ScopedLogMessage(std::string_view file,
 ScopedLogMessage::~ScopedLogMessage() {
   if (ShouldEmitToStandardLog()) {
     // Create a log for the standard logging system.
-    logging::LogMessage log_message(file_, line_, severity_);
+    logging::LogMessage log_message(file_.data(), line_, severity_);
     log_message.stream() << stream_.str();
   }
 }
@@ -37,7 +37,7 @@ bool ScopedLogMessage::ShouldEmitToStandardLog() const {
   // - The Vlog Level for |file_| is at least 1
   // - The --quick-start-verbose-logging switch is enabled
   return severity_ > logging::LOGGING_VERBOSE ||
-         logging::GetVlogLevelHelper(file_) > 0 ||
+         logging::GetVlogLevelHelper(file_.data(), file_.size()) > 0 ||
          base::CommandLine::ForCurrentProcess()->HasSwitch(
              kQuickStartVerboseLoggingSwitch);
 }

chromeos/ash/components/quick_start/logging_unittest.cc

@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/ash/components/quick_start/logging.h"
-
 #include <stddef.h>
 
-#include <string_view>
-
 #include "base/command_line.h"
 #include "base/no_destructor.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#include "chromeos/ash/components/quick_start/logging.h"
+
 namespace ash::quick_start {
 
 namespace {
@@ -29,7 +27,7 @@ std::vector<std::string>& GetStandardLogs() {
 }
 
 bool HandleStandardLogMessage(int severity,
-                              std::string_view file,
+                              const char* file,
                               int line,
                               size_t message_start,
                               const std::string& str) {

components/cross_device/logging/logging.cc

@@ -16,17 +16,17 @@ CrossDeviceScopedLogMessage::~CrossDeviceScopedLogMessage() {
   const std::string string_from_stream = stream_.str();
   CrossDeviceLogBuffer::GetInstance()->AddLogMessage(
       CrossDeviceLogBuffer::LogMessage(string_from_stream, feature_,
-                                       base::Time::Now(), std::string(file_),
+                                       base::Time::Now(), file_.data(), line_,
-                                       line_, severity_));
+                                       severity_));
 
   // Don't emit VERBOSE-level logging to the standard logging system.
   if (severity_ <= logging::LOGGING_VERBOSE &&
-      logging::GetVlogLevelHelper(file_) <= 0) {
+      logging::GetVlogLevelHelper(file_.data(), file_.size()) <= 0) {
     return;
   }
 
   // The destructor of |log_message| also creates a log for the standard logging
   // system.
-  logging::LogMessage log_message(file_, line_, severity_);
+  logging::LogMessage log_message(file_.data(), line_, severity_);
   log_message.stream() << string_from_stream;
 }

components/cross_device/logging/logging.h

@@ -15,9 +15,9 @@
 // Use the CD_LOG() macro for all logging related to Cross Device Features so
 // the debug page can reflect all logs related to this feature in the internal
 // debug WebUI (chrome://nearby-internals).
-#define CD_LOG(severity, feature)                                   \
+#define CD_LOG(severity, feature)                                              \
-  CrossDeviceScopedLogMessage(std::string_view(__FILE__), __LINE__, \
+  CrossDeviceScopedLogMessage(std::string_view(__FILE__, std::size(__FILE__)), \
-                              logging::LOGGING_##severity, feature) \
+                              __LINE__, logging::LOGGING_##severity, feature)  \
       .stream()
 
 // An intermediate object used by the CD_LOG macro, wrapping a

components/cross_device/logging/logging_unittest.cc

@@ -2,18 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/cross_device/logging/logging.h"
-
 #include <stddef.h>
 
-#include <string_view>
-
 #include "base/no_destructor.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
-#include "components/cross_device/logging/log_buffer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#include "components/cross_device/logging/log_buffer.h"
+#include "components/cross_device/logging/logging.h"
+
 namespace {
 
 const char kLog1[] = "Mahogony destined to make a sturdy table";
@@ -29,7 +27,7 @@ std::vector<std::string>& GetStandardLogs() {
 }
 
 bool HandleStandardLogMessage(int severity,
-                              std::string_view file,
+                              const char* file,
                               int line,
                               size_t message_start,
                               const std::string& str) {

components/openscreen_platform/logging.cc

@@ -35,7 +35,7 @@ namespace {
 
 bool IsLoggingOn(LogLevel level, std::string_view file) {
   if (level == LogLevel::kVerbose) {
-    return ::logging::GetVlogLevelHelper(file) > 0;
+    return ::logging::GetVlogLevelHelper(file.data(), file.size()) > 0;
   }
   return ::logging::ShouldCreateLogMessage(MapLogLevel(level));
 }

components/peripherals/logging/logging_unittest.cc

@@ -6,8 +6,6 @@
 
 #include <stddef.h>
 
-#include <string_view>
-
 #include "ash/constants/ash_features.h"
 #include "base/no_destructor.h"
 #include "base/strings/string_number_conversions.h"
@@ -33,7 +31,7 @@ std::vector<std::string>& GetStandardLogs() {
 }
 
 bool HandleStandardLogMessage(int severity,
-                              std::string_view file,
+                              const char* file,
                               int line,
                               size_t message_start,
                               const std::string& str) {

components/policy/core/common/policy_logger.cc

@@ -145,16 +145,19 @@ void PolicyLogger::LogHelper::StreamLog() const {
 
   // Check for verbose logging.
   if (log_verbosity_ != policy::PolicyLogger::LogHelper::kNoVerboseLog) {
-    LAZY_STREAM(::logging::LogMessage(file_, line_, -(log_verbosity_)).stream(),
+    LAZY_STREAM(
-                log_verbosity_ <= ::logging::GetVlogLevelHelper(file_))
+        ::logging::LogMessage(file_.data(), line_, -(log_verbosity_)).stream(),
+        log_verbosity_ <=
+            ::logging::GetVlogLevelHelper(file_.data(), file_.size()))
         << message_buffer_.str();
     return;
   }
 
   int log_severity_int = GetLogSeverityInt(log_severity_);
 
-  LAZY_STREAM(::logging::LogMessage(file_, line_, log_severity_int).stream(),
+  LAZY_STREAM(
-              ::logging::ShouldCreateLogMessage(log_severity_int))
+      ::logging::LogMessage(file_.data(), line_, log_severity_int).stream(),
+      ::logging::ShouldCreateLogMessage(log_severity_int))
       << message_buffer_.str();
 }
 

components/viz/service/gl/gpu_service_impl.cc

@@ -172,12 +172,12 @@ struct LogMessage {
 
 // Forward declare log handlers so they can be used within LogMessageManager.
 bool PreInitializeLogHandler(int severity,
-                             std::string_view file,
+                             const char* file,
                              int line,
                              size_t message_start,
                              const std::string& message);
 bool PostInitializeLogHandler(int severity,
-                              std::string_view file,
+                              const char* file,
                               int line,
                               size_t message_start,
                               const std::string& message);
@@ -269,7 +269,7 @@ LogMessageManager* GetLogMessageManager() {
 }
 
 bool PreInitializeLogHandler(int severity,
-                             std::string_view file,
+                             const char* file,
                              int line,
                              size_t message_start,
                              const std::string& message) {
@@ -280,7 +280,7 @@ bool PreInitializeLogHandler(int severity,
 }
 
 bool PostInitializeLogHandler(int severity,
-                              std::string_view file,
+                              const char* file,
                               int line,
                               size_t message_start,
                               const std::string& message) {

content/public/test/browser_test_base.cc

@@ -530,8 +530,8 @@ void BrowserTestBase::SetUp() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableTracing)) {
     DCHECK(!logging::GetLogMessageHandler());
-    logging::SetLogMessageHandler([](int severity, std::string_view file,
+    logging::SetLogMessageHandler([](int severity, const char* file, int line,
-                                     int line, size_t message_start,
+                                     size_t message_start,
                                      const std::string& str) {
       // TODO(crbug.com/40161080): Print the message to the console before
       // calling this to ensure that the message is still printed if something

net/test/scoped_disable_exit_on_dfatal.cc

@@ -17,11 +17,10 @@ ScopedDisableExitOnDFatal::ScopedDisableExitOnDFatal()
 ScopedDisableExitOnDFatal::~ScopedDisableExitOnDFatal() = default;
 
 // static
-void ScopedDisableExitOnDFatal::LogAssertHandler(
+void ScopedDisableExitOnDFatal::LogAssertHandler(const char* file,
-    std::string_view file,
+                                                 int line,
-    int line,
+                                                 std::string_view message,
-    const std::string_view message,
+                                                 std::string_view stack_trace) {
-    const std::string_view stack_trace) {
   // Simply swallow the assert.
 }
 

net/test/scoped_disable_exit_on_dfatal.h

@@ -30,7 +30,7 @@ class ScopedDisableExitOnDFatal {
  private:
   // Static function which is set as the logging assert handler.
   // Called when there is a check failure.
-  static void LogAssertHandler(std::string_view file,
+  static void LogAssertHandler(const char* file,
                                int line,
                                std::string_view message,
                                std::string_view stack_trace);

net/tools/stress_cache/stress_cache.cc

@@ -386,7 +386,7 @@ bool StartCrashThread() {
   return true;
 }
 
-void CrashHandler(std::string_view file,
+void CrashHandler(const char* file,
                   int line,
                   std::string_view str,
                   std::string_view stack_trace) {

remoting/host/native_messaging/log_message_handler.cc

@@ -4,8 +4,6 @@
 
 #include "remoting/host/native_messaging/log_message_handler.h"
 
-#include <string_view>
-
 #include "base/functional/bind.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ -57,7 +55,7 @@ const char* LogMessageHandler::kDebugMessageTypeName = "_debug_log";
 
 // static
 bool LogMessageHandler::OnLogMessage(logging::LogSeverity severity,
-                                     std::string_view file,
+                                     const char* file,
                                      int line,
                                      size_t message_start,
                                      const std::string& str) {
@@ -71,7 +69,7 @@ bool LogMessageHandler::OnLogMessage(logging::LogSeverity severity,
 
 void LogMessageHandler::PostLogMessageToCorrectThread(
     logging::LogSeverity severity,
-    std::string_view file,
+    const char* file,
     int line,
     size_t message_start,
     const std::string& str) {
@@ -103,7 +101,7 @@ void LogMessageHandler::PostLogMessageToCorrectThread(
 }
 
 void LogMessageHandler::SendLogMessageToClient(logging::LogSeverity severity,
-                                               std::string_view file,
+                                               const char* file,
                                                int line,
                                                size_t message_start,
                                                const std::string& str) {

remoting/host/native_messaging/log_message_handler.h

@@ -45,17 +45,17 @@ class LogMessageHandler {
   // TODO(yuweih): Reimplement this class using using a message queue which is
   // protected by |g_log_message_handler_lock|.
   static bool OnLogMessage(int severity,
-                           std::string_view file,
+                           const char* file,
                            int line,
                            size_t message_start,
                            const std::string& str);
   void PostLogMessageToCorrectThread(int severity,
-                                     std::string_view file,
+                                     const char* file,
                                      int line,
                                      size_t message_start,
                                      const std::string& str);
   void SendLogMessageToClient(int severity,
-                              std::string_view file,
+                              const char* file,
                               int line,
                               size_t message_start,
                               const std::string& str);

sandbox/linux/tests/main.cc

@@ -41,7 +41,7 @@ void RunPostTestsChecks(const base::FilePath& orig_cwd) {
 }  // namespace sandbox
 
 #if !defined(SANDBOX_USES_BASE_TEST_SUITE)
-void UnitTestAssertHandler(std::string_view file,
+void UnitTestAssertHandler(const char* file,
                            int line,
                            std::string_view message,
                            std::string_view stack_trace) {

third_party/crashpad/README.chromium

@@ -59,5 +59,3 @@ Local Modifications:
    "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_buildflags.h",
    https://crbug.com/1467773
  - CPEPrefix for third_party/zlib is added to README.chromium
- - logging::LogMessageHandler signature updated to use std::string_view in
-   crashpad/util/thread/thread_log_messages.cc

third_party/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer.cc

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <string_view>
-
 #include <inttypes.h>
 
 #include "base/logging.h"
@@ -47,11 +45,10 @@ class FakeProcessMemory : public ProcessMemory {
 
 extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv) {
   // Swallow all logs to avoid spam.
-  logging::SetLogMessageHandler([](logging::LogSeverity,
+  logging::SetLogMessageHandler(
-                                   std::string_view,
+      [](logging::LogSeverity, const char*, int, size_t, const std::string&) {
-                                   int,
+        return true;
-                                   size_t,
+      });
-                                   const std::string&) { return true; });
   return 0;
 }
 

third_party/crashpad/crashpad/util/thread/thread_log_messages.cc

@@ -16,8 +16,6 @@
 
 #include <sys/types.h>
 
-#include <string_view>
-
 #include "base/check_op.h"
 #include "base/logging.h"
 
@@ -28,7 +26,7 @@ namespace {
 thread_local std::vector<std::string>* thread_local_log_messages;
 
 bool LogMessageHandler(logging::LogSeverity severity,
-                       std::string_view file_path,
+                       const char* file_path,
                        int line,
                        size_t message_start,
                        const std::string& string) {

third_party/webrtc_overrides/rtc_base/logging.cc

@@ -14,7 +14,6 @@
 #include <algorithm>
 #include <atomic>
 #include <iomanip>
-#include <string_view>
 
 #include "base/logging.h"
 #include "base/notreached.h"
@@ -227,7 +226,7 @@ bool CheckVlogIsOnHelper(LoggingSeverity severity,
                          const char* file,
                          size_t N) {
   return WebRtcVerbosityLevel(severity) <=
-         ::logging::GetVlogLevelHelper(std::string_view(file, N - 1));
+         ::logging::GetVlogLevelHelper(file, N);
 }
 
 }  // namespace webrtc

tools/accessibility/inspect/ax_dump_events.cc

@@ -5,7 +5,6 @@
 #include <iostream>
 #include <memory>
 #include <string>
-#include <string_view>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
@@ -25,7 +24,7 @@ namespace {
 constexpr char kHelpSwitch[] = "help";
 
 bool AXDumpEventsLogMessageHandler(int severity,
-                                   std::string_view file,
+                                   const char* file,
                                    int line,
                                    size_t message_start,
                                    const std::string& str) {

tools/accessibility/inspect/ax_dump_tree.cc

@@ -6,7 +6,6 @@
 #include <iostream>
 #include <numeric>
 #include <string>
-#include <string_view>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
@@ -23,7 +22,7 @@ constexpr char kApiSwitch[] = "api";
 constexpr char kHelpSwitch[] = "help";
 
 bool AXDumpTreeLogMessageHandler(int severity,
-                                 std::string_view file,
+                                 const char* file,
                                  int line,
                                  size_t message_start,
                                  const std::string& str) {