Fix backwards WebRTC-in-Chromium override and expose Chromium logging setup

third_party/webrtc_overrides/webrtc/base/logging.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // NOTE:
 // Since this file includes Chromium headers, it must not include
 // third_party/webrtc/base/logging.h since it defines some of the same macros as
 // Chromium does and we'll run into conflicts.
 
 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
 #include <CoreServices/CoreServices.h>
 #endif  // OS_MACOSX
 
 #include <algorithm>
 #include <iomanip>
+#include <string>
 
 #include "base/atomicops.h"
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/threading/platform_thread.h"
 #include "third_party/webrtc/base/stringencode.h"
 #include "third_party/webrtc/base/stringutils.h"
 
 // This needs to be included after base/logging.h.
 #include "third_party/webrtc_overrides/webrtc/base/diagnostic_logging.h"
 #include "third_party/webrtc_overrides/webrtc/base/logging.h"
 
@@ skipping 14 matching lines @@
 
 void (*g_logging_delegate_function)(const std::string&) = NULL;
 void (*g_extra_logging_init_function)(
     void (*logging_delegate_function)(const std::string&)) = NULL;
 #ifndef NDEBUG
 static_assert(sizeof(base::subtle::Atomic32) == sizeof(base::PlatformThreadId),
               "Atomic32 not same size as PlatformThreadId");
 base::subtle::Atomic32 g_init_logging_delegate_thread_id = 0;
 #endif
 
+void InitChromiumLoggingAndCommandLine() {

[tommi (sloooow) - chröme, 2016/05/18 11:47:50]

this function shouldn't be here - is it unused?

[katrielc, 2016/05/18 12:00:46]

It's currently unused, but the plan is to call it from webrtc (specifically,
under an ifdef WEBRTC_CHROMIUM_BUILD in webrtc_fuzzer_main.cc).

If not here, where should it be?

+  // 0 means no arguments, so the null argv is never touched
+  base::CommandLine::Init(0, nullptr);
+
+  // Chromium checks for the presence of --v when deciding log level.
+  // Note that the *value* of --v doesn't matter for this check.
+  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII("v", "");
+  logging::InitLogging(logging::LoggingSettings());
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // Constant Labels
 /////////////////////////////////////////////////////////////////////////////
 
 const char* FindLabel(int value, const ConstantLabel entries[]) {
   for (int i = 0; entries[i].label; ++i) {
     if (value == entries[i].value) return entries[i].label;
   }
   return 0;
 }
@@ skipping 11 matching lines @@
   base::snprintf(buffer, sizeof(buffer), "0x%08x", err);
   return buffer;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // Log helper functions
 /////////////////////////////////////////////////////////////////////////////
 
 inline int WebRtcSevToChromeSev(LoggingSeverity sev) {
   switch (sev) {
+    case LS_NONE:
+      // Used to set the log level for "no logging", so must be less
+      // than LOG_ERROR.
+      return ::logging::LOG_FATAL;
     case LS_ERROR:
       return ::logging::LOG_ERROR;
     case LS_WARNING:
       return ::logging::LOG_WARNING;
     case LS_INFO:
       return ::logging::LOG_INFO;
     case LS_VERBOSE:
     case LS_SENSITIVE:
       return ::logging::LOG_VERBOSE;
     default:
@@ skipping 101 matching lines @@
           rtc::WebRtcSevToChromeSev(severity_)) << str;
     }
 
     if (g_logging_delegate_function && severity_ <= LS_INFO) {
       g_logging_delegate_function(str);
     }
   }
 }
 
 // static
-void LogMessage::LogToDebug(int min_sev) {
-  logging::SetMinLogLevel(min_sev);
+void LogMessage::LogToDebug(LoggingSeverity min_sev) {
+  logging::SetMinLogLevel(WebRtcSevToChromeSev(min_sev));
 }
 
 // Note: this function is a copy from the overriden libjingle implementation.
 void LogMultiline(LoggingSeverity level, const char* label, bool input,
                   const void* data, size_t len, bool hex_mode,
                   LogMultilineState* state) {
   // TODO(grunell): This will not do the expected verbosity level checking. We
   // need a macro for the multiline logging.
   // https://code.google.com/p/webrtc/issues/detail?id=5011
   if (!LOG_CHECK_LEVEL_V(level))
@@ skipping 140 matching lines @@
   g_extra_logging_init_function = function;
 }
 
 bool CheckVlogIsOnHelper(
     rtc::LoggingSeverity severity, const char* file, size_t N) {
   return rtc::WebRtcVerbosityLevel(severity) <=
          ::logging::GetVlogLevelHelper(file, N);
 }
 
 }  // namespace rtc