Make base::Logging compile with the NaCl toolchain.

base/logging.cc

 // Copyright (c) 2012 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.
 
 #include "base/logging.h"
 
 #if defined(OS_WIN)
 #include <io.h>
 #include <windows.h>
 typedef HANDLE FileHandle;
@@ skipping 329 matching lines @@
 }
 
 }  // namespace
 
 
 bool BaseInitLoggingImpl(const PathChar* new_log_file,
                          LoggingDestination logging_dest,
                          LogLockingState lock_log,
                          OldFileDeletionState delete_old,
                          DcheckState dcheck_state) {
+  g_dcheck_state = dcheck_state;
+// TODO(bbudge) Hook this up to NaCl logging.
+#if !defined(OS_NACL)
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  g_dcheck_state = dcheck_state;
-
   // 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;
 
@@ skipping 21 matching lines @@
       logging_destination == LOG_ONLY_TO_SYSTEM_DEBUG_LOG)
     return true;
 
   if (!log_file_name)
     log_file_name = new PathString();
   *log_file_name = new_log_file;
   if (delete_old == DELETE_OLD_LOG_FILE)
     DeleteFilePath(*log_file_name);
 
   return InitializeLogFileHandle();
+#else
+  return true;
+#endif  // !defined(OS_NACL)
 }
 
 void SetMinLogLevel(int level) {
   min_log_level = std::min(LOG_ERROR_REPORT, level);
 }
 
 int GetMinLogLevel() {
   return min_log_level;
 }
 
@@ skipping 141 matching lines @@
                        std::string* result)
     : severity_(severity), file_(file), line_(line) {
   Init(file, line);
   stream_ << "Check failed: " << *result;
   delete result;
 }
 
 LogMessage::~LogMessage() {
   // TODO(port): enable stacktrace generation on LOG_FATAL once backtrace are
   // working in Android.
-#if  !defined(NDEBUG) && !defined(OS_ANDROID)
+#if  !defined(NDEBUG) && !defined(OS_ANDROID) && !defined(OS_NACL)
   if (severity_ == LOG_FATAL) {
     // Include a stack trace on a fatal.
     base::debug::StackTrace trace;
     stream_ << std::endl;  // Newline to separate from log message.
     trace.OutputToStream(&stream_);
   }
 #endif
   stream_ << std::endl;
   std::string str_newline(stream_.str());
 
@@ skipping 270 matching lines @@
 }
 
 // This was defined at the beginning of this file.
 #undef write
 
 }  // namespace logging
 
 std::ostream& operator<<(std::ostream& out, const wchar_t* wstr) {
   return out << WideToUTF8(std::wstring(wstr));
 }