BASELINE: Update Chromium to 88.0.4324.208

Change-Id: I3ae87d23e4eff4b4a469685658740a213600c667
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 60 insertions, 53 deletions

diff --git a/chromium/base/logging.cc b/chromium/base/logging.cc
index b5cf2c4933d..b9f8555aada 100644
--- a/chromium/base/logging.cc
+++ b/chromium/base/logging.cc
@@ -142,11 +142,11 @@ VlogInfo* g_vlog_info = nullptr;
 VlogInfo* g_vlog_info_prev = nullptr;
 
 const char* const log_severity_names[] = {"INFO", "WARNING", "ERROR", "FATAL"};
-static_assert(LOG_NUM_SEVERITIES == base::size(log_severity_names),
+static_assert(LOGGING_NUM_SEVERITIES == base::size(log_severity_names),
               "Incorrect number of log_severity_names");
 
 const char* log_severity_name(int severity) {
-  if (severity >= 0 && severity < LOG_NUM_SEVERITIES)
+  if (severity >= 0 && severity < LOGGING_NUM_SEVERITIES)
     return log_severity_names[severity];
   return "UNKNOWN";
 }
@@ -162,8 +162,8 @@ int g_logging_destination = LOG_DEFAULT;
 LogFormat g_log_format = LogFormat::LOG_FORMAT_SYSLOG;
 #endif
 
-// For LOG_ERROR and above, always print to stderr.
-const int kAlwaysPrintErrorLevel = LOG_ERROR;
+// For LOGGING_ERROR and above, always print to stderr.
+const int kAlwaysPrintErrorLevel = LOGGING_ERROR;
 
 // Which log file to use? This is initialized by InitLogging or
 // will be lazily initialized to the default value when it is
@@ -347,10 +347,10 @@ void CloseLogFileUnlocked() {
 }  // namespace
 
 #if defined(DCHECK_IS_CONFIGURABLE)
-// In DCHECK-enabled Chrome builds, allow the meaning of LOG_DCHECK to be
+// In DCHECK-enabled Chrome builds, allow the meaning of LOGGING_DCHECK to be
 // determined at run-time. We default it to INFO, to avoid it triggering
 // crashes before the run-time has explicitly chosen the behaviour.
-BASE_EXPORT logging::LogSeverity LOG_DCHECK = LOG_INFO;
+BASE_EXPORT logging::LogSeverity LOGGING_DCHECK = LOGGING_INFO;
 #endif  // defined(DCHECK_IS_CONFIGURABLE)
 
 // This is never instantiated, it's just used for EAT_STREAM_PARAMETERS to have
@@ -369,35 +369,42 @@ bool BaseInitLoggingImpl(const LoggingSettings& settings) {
   g_log_format = settings.log_format;
 #endif
 
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  // Don't bother initializing |g_vlog_info| unless we use one of the
-  // vlog switches.
-  if (command_line->HasSwitch(switches::kV) ||
-      command_line->HasSwitch(switches::kVModule)) {
-    // NOTE: If |g_vlog_info| has already been initialized, it might be in use
-    // by another thread. Don't delete the old VLogInfo, just create a second
-    // one. We keep track of both to avoid memory leak warnings.
-    CHECK(!g_vlog_info_prev);
-    g_vlog_info_prev = g_vlog_info;
-
-    g_vlog_info =
-        new VlogInfo(command_line->GetSwitchValueASCII(switches::kV),
-                     command_line->GetSwitchValueASCII(switches::kVModule),
-                     &g_min_log_level);
+  if (base::CommandLine::InitializedForCurrentProcess()) {
+    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+    // Don't bother initializing |g_vlog_info| unless we use one of the
+    // vlog switches.
+    if (command_line->HasSwitch(switches::kV) ||
+        command_line->HasSwitch(switches::kVModule)) {
+      // NOTE: If |g_vlog_info| has already been initialized, it might be in use
+      // by another thread. Don't delete the old VLogInfo, just create a second
+      // one. We keep track of both to avoid memory leak warnings.
+      CHECK(!g_vlog_info_prev);
+      g_vlog_info_prev = g_vlog_info;
+
+      g_vlog_info =
+          new VlogInfo(command_line->GetSwitchValueASCII(switches::kV),
+                       command_line->GetSwitchValueASCII(switches::kVModule),
+                       &g_min_log_level);
+    }
   }
 
   g_logging_destination = settings.logging_dest;
 
 #if defined(OS_FUCHSIA)
   if (g_logging_destination & LOG_TO_SYSTEM_DEBUG_LOG) {
-    fx_logger_config_t config;
-    config.min_severity = FX_LOG_INFO;
-    config.console_fd = -1;
-    config.log_service_channel = ZX_HANDLE_INVALID;
-    std::string log_tag = command_line->GetProgram().BaseName().AsUTF8Unsafe();
+    std::string log_tag = base::CommandLine::ForCurrentProcess()
+                              ->GetProgram()
+                              .BaseName()
+                              .AsUTF8Unsafe();
     const char* log_tag_data = log_tag.data();
-    config.tags = &log_tag_data;
-    config.num_tags = 1;
+
+    fx_logger_config_t config = {
+        .min_severity = FX_LOG_INFO,
+        .console_fd = -1,
+        .log_service_channel = ZX_HANDLE_INVALID,
+        .tags = &log_tag_data,
+        .num_tags = 1,
+    };
     fx_log_reconfigure(&config);
   }
 #endif
@@ -422,6 +429,8 @@ bool BaseInitLoggingImpl(const LoggingSettings& settings) {
   }
 #endif
 
+  DCHECK(settings.log_file_path) << "LOG_TO_FILE set but no log_file_path!";
+
   if (!g_log_file_name)
     g_log_file_name = new PathString();
   *g_log_file_name = settings.log_file_path;
@@ -432,7 +441,7 @@ bool BaseInitLoggingImpl(const LoggingSettings& settings) {
 }
 
 void SetMinLogLevel(int level) {
-  g_min_log_level = std::min(LOG_FATAL, level);
+  g_min_log_level = std::min(LOGGING_FATAL, level);
 }
 
 int GetMinLogLevel() {
@@ -541,7 +550,7 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity)
 }
 
 LogMessage::LogMessage(const char* file, int line, const char* condition)
-    : severity_(LOG_FATAL), file_(file), line_(line) {
+    : severity_(LOGGING_FATAL), file_(file), line_(line) {
   Init(file, line);
   stream_ << "Check failed: " << condition << ". ";
 }
@@ -550,7 +559,7 @@ LogMessage::~LogMessage() {
   size_t stack_start = stream_.tellp();
 #if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
     !defined(OS_AIX)
-  if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
+  if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
     // Include a stack trace on a fatal, unless a debugger is attached.
     base::debug::StackTrace stack_trace;
     stream_ << std::endl;  // Newline to separate from log message.
@@ -678,13 +687,13 @@ LogMessage::~LogMessage() {
 #define ASL_LEVEL_STR(level) ASL_LEVEL_STR_X(level)
 #define ASL_LEVEL_STR_X(level) #level
         switch (severity) {
-          case LOG_INFO:
+          case LOGGING_INFO:
             return ASL_LEVEL_STR(ASL_LEVEL_INFO);
-          case LOG_WARNING:
+          case LOGGING_WARNING:
             return ASL_LEVEL_STR(ASL_LEVEL_WARNING);
-          case LOG_ERROR:
+          case LOGGING_ERROR:
             return ASL_LEVEL_STR(ASL_LEVEL_ERR);
-          case LOG_FATAL:
+          case LOGGING_FATAL:
             return ASL_LEVEL_STR(ASL_LEVEL_CRIT);
           default:
             return severity < 0 ? ASL_LEVEL_STR(ASL_LEVEL_DEBUG)
@@ -718,13 +727,13 @@ LogMessage::~LogMessage() {
       } log(main_bundle_id.empty() ? nullptr : main_bundle_id.c_str());
       const os_log_type_t os_log_type = [](LogSeverity severity) {
         switch (severity) {
-          case LOG_INFO:
+          case LOGGING_INFO:
             return OS_LOG_TYPE_INFO;
-          case LOG_WARNING:
+          case LOGGING_WARNING:
             return OS_LOG_TYPE_DEFAULT;
-          case LOG_ERROR:
+          case LOGGING_ERROR:
             return OS_LOG_TYPE_ERROR;
-          case LOG_FATAL:
+          case LOGGING_FATAL:
             return OS_LOG_TYPE_FAULT;
           default:
             return severity < 0 ? OS_LOG_TYPE_DEBUG : OS_LOG_TYPE_DEFAULT;
@@ -738,16 +747,16 @@ LogMessage::~LogMessage() {
     android_LogPriority priority =
         (severity_ < 0) ? ANDROID_LOG_VERBOSE : ANDROID_LOG_UNKNOWN;
     switch (severity_) {
-      case LOG_INFO:
+      case LOGGING_INFO:
         priority = ANDROID_LOG_INFO;
         break;
-      case LOG_WARNING:
+      case LOGGING_WARNING:
         priority = ANDROID_LOG_WARN;
         break;
-      case LOG_ERROR:
+      case LOGGING_ERROR:
         priority = ANDROID_LOG_ERROR;
         break;
-      case LOG_FATAL:
+      case LOGGING_FATAL:
         priority = ANDROID_LOG_FATAL;
         break;
     }
@@ -770,16 +779,16 @@ LogMessage::~LogMessage() {
 #elif defined(OS_FUCHSIA)
     fx_log_severity_t severity = FX_LOG_INFO;
     switch (severity_) {
-      case LOG_INFO:
+      case LOGGING_INFO:
         severity = FX_LOG_INFO;
         break;
-      case LOG_WARNING:
+      case LOGGING_WARNING:
         severity = FX_LOG_WARNING;
         break;
-      case LOG_ERROR:
+      case LOGGING_ERROR:
         severity = FX_LOG_ERROR;
         break;
-      case LOG_FATAL:
+      case LOGGING_FATAL:
         // Don't use FX_LOG_FATAL, otherwise fx_logger_log() will abort().
         severity = FX_LOG_ERROR;
         break;
@@ -790,10 +799,8 @@ LogMessage::~LogMessage() {
       // Temporarily remove the trailing newline from |str_newline|'s C-string
       // representation, since fx_logger will add a newline of its own.
       str_newline.pop_back();
-      std::string message =
-          base::StringPrintf("%s(%d) %s", file_basename_, line_,
-                             str_newline.c_str() + message_start_);
-      fx_logger_log(logger, severity, nullptr, message.data());
+      fx_logger_log_with_source(logger, severity, nullptr, file_, line_,
+                                str_newline.c_str() + message_start_);
       str_newline.push_back('\n');
     }
 #endif  // OS_FUCHSIA
@@ -833,7 +840,7 @@ LogMessage::~LogMessage() {
     }
   }
 
-  if (severity_ == LOG_FATAL) {
+  if (severity_ == LOGGING_FATAL) {
     // Write the log message to the global activity tracker, if running.
     base::debug::GlobalActivityTracker* tracker =
         base::debug::GlobalActivityTracker::Get();
@@ -1102,7 +1109,7 @@ void RawLog(int level, const char* message) {
     }
   }
 
-  if (level == LOG_FATAL)
+  if (level == LOGGING_FATAL)
     base::debug::BreakDebugger();
 }