New test infrastructure for producing verbose logs in failing tests.

base/logging_win.cc

Index: base/logging_win.cc
diff --git a/base/logging_win.cc b/base/logging_win.cc
index a71466578847f355bab8ddca045e0dacaef68497..6e58795c7e401417fd984b5c02a082c15e544954 100644
--- a/base/logging_win.cc
+++ b/base/logging_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -57,8 +57,12 @@ bool LogEventProvider::LogMessage(logging::LogSeverity severity,
   // And now log the event.
   if (provider->enable_flags() & ENABLE_LOG_MESSAGE_ONLY) {
     EtwMofEvent<1> event(kLogEventId, LOG_MESSAGE, level);
-    event.SetField(0, message.length() + 1 - message_start,
-        message.c_str() + message_start);
+    if (provider->enable_flags() & ENABLE_DETAILED_LOG_MESSAGE) {
+      event.SetField(0, message.length() + 1, message.c_str());
+    } else {
+      event.SetField(0, message.length() + 1 - message_start,
+          message.c_str() + message_start);
+    }
 
     provider->Log(event.get());
   } else {
@@ -83,8 +87,12 @@ bool LogEventProvider::LogMessage(logging::LogSeverity severity,
     // The file.
     event.SetField(3, strlen(file) + 1, file);
     // And finally the message.
-    event.SetField(4, message.length() + 1 - message_start,
-        message.c_str() + message_start);
+    if (provider->enable_flags() & ENABLE_DETAILED_LOG_MESSAGE) {
+      event.SetField(4, message.length() + 1, message.c_str());
+    } else {
+      event.SetField(4, message.length() + 1 - message_start,
+          message.c_str() + message_start);
+    }
 
     provider->Log(event.get());
   }