Move eventlog_provider from //base/win to //chrome/common/win

base/syslog_logging.cc

 // Copyright 2016 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/debug/stack_trace.h"
 #include "base/syslog_logging.h"

[grt (UTC plus 2), 2017/06/21 20:26:15]

nit: this should be the first include with a blank line between it and the other
includes

[proberge, 2017/06/21 21:33:39]

Done.

 
 #if defined(OS_WIN)
+#include <stddef.h>

[grt (UTC plus 2), 2017/06/21 20:26:15]

why is this needed?

[proberge, 2017/06/21 21:33:38]

I think I was trying to get WORD/DWORD defined. Removed it.

 #include "base/bind.h"
 #include "base/callback_helpers.h"
-#include "base/win/eventlog_messages.h"
-
-#include <windows.h>
 #elif defined(OS_LINUX)
 #include <syslog.h>
 #endif
 
 #include <cstring>

[grt (UTC plus 2), 2017/06/21 20:26:15]

this doesn't seem to be used, is it?

[proberge, 2017/06/21 21:33:38]

Done.

 #include <ostream>
 #include <string>
 
 namespace logging {
 
 #if defined(OS_WIN)
 
 namespace {
 std::string* g_event_source_name = nullptr;

[grt (UTC plus 2), 2017/06/21 20:26:15]

now that there's more than one thing in here, please add blank lines between the
opening and closure of the namespace.

[proberge, 2017/06/21 21:33:38]

Done.

+WORD g_category;

[grt (UTC plus 2), 2017/06/21 20:26:15]

please zero-initialize these

[proberge, 2017/06/21 21:33:38]

Done.

+DWORD g_event_id;
 }

[grt (UTC plus 2), 2017/06/21 20:26:15]

nit:
}  // namespace

[proberge, 2017/06/21 21:33:38]

Done.

 
-void SetEventSourceName(const std::string& name) {
+void SetEventSource(const std::string& name, WORD category, DWORD event_id) {
   DCHECK_EQ(nullptr, g_event_source_name);
   g_event_source_name = new std::string(name);
+  g_category = category;
+  g_event_id = event_id;
 }
 #endif  // defined(OS_WIN)

[grt (UTC plus 2), 2017/06/21 20:26:15]

nit: blank line before this

[proberge, 2017/06/21 21:33:38]

Done.

 
 EventLogMessage::EventLogMessage(const char* file,
                                  int line,
                                  LogSeverity severity)
     : log_message_(file, line, severity) {
 }
 
 EventLogMessage::~EventLogMessage() {
 #if defined(OS_WIN)
   // If g_event_source_name is nullptr (which it is per default) SYSLOG will
@@ skipping 23 matching lines @@
     case LOG_ERROR:
     case LOG_FATAL:
       // The price of getting the stack trace is not worth the hassle for
       // non-error conditions.
       base::debug::StackTrace trace;
       message.append(trace.ToString());
       log_type = EVENTLOG_ERROR_TYPE;
       break;
   }
   LPCSTR strings[1] = {message.data()};
-  if (!ReportEventA(event_log_handle, log_type, BROWSER_CATEGORY,
-                    MSG_LOG_MESSAGE, NULL, 1, 0, strings, NULL)) {
+  if (!ReportEventA(event_log_handle, log_type, g_category, g_event_id, NULL, 1,

[grt (UTC plus 2), 2017/06/21 20:26:15]

NULL -> nullptr throughout

[proberge, 2017/06/21 21:33:38]

Done.

+                    0, strings, NULL)) {
     stream() << " !!NOT ADDED TO EVENTLOG!!";
   }
 #elif defined(OS_LINUX)
   const char kEventSource[] = "chrome";
   openlog(kEventSource, LOG_NOWAIT | LOG_PID, LOG_USER);
   // We can't use the defined names for the logging severity from syslog.h
   // because they collide with the names of our own severity levels. Therefore
   // we use the actual values which of course do not match ours.
   // See sys/syslog.h for reference.
   int priority = 3;
@@ skipping 10 matching lines @@
     case LOG_FATAL:
       priority = 2;
       break;
   }
   syslog(priority, "%s", log_message_.str().c_str());
   closelog();
 #endif  // defined(OS_WIN)
 }
 
 }  // namespace logging