Merge gpu_trace_event back into base/debug/trace_event

base/debug/trace_event_win_unittest.cc

 // Copyright (c) 2010 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/trace_event.h"
 
 #include <strstream>
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/file_util.h"
+#include "base/debug/trace_event.h"
+#include "base/debug/trace_event_win.h"
 #include "base/win/event_trace_consumer.h"
 #include "base/win/event_trace_controller.h"
+#include "base/win/event_trace_provider.h"
 #include "base/win/windows_version.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <initguid.h>  // NOLINT - must be last include.
 
 namespace base {
 namespace debug {
 
 namespace {
 
@@ skipping 72 matching lines @@
       // Tear down any dangling session from an earlier failing test.
       EtwTraceProperties ignore;
       EtwTraceController::Stop(kTestSessionName, &ignore);
     }
 
     // Resurrect and initialize the TraceLog singleton instance.
     // On Vista and better, we need the provider registered before we
     // start the private, in-proc session, but on XP we need the global
     // session created and the provider enabled before we register our
     // provider.
-    TraceLog* tracelog = NULL;
+    TraceEventETWProvider* tracelog = NULL;
     if (!is_xp) {
-      TraceLog::Resurrect();
-      tracelog = TraceLog::GetInstance();
+      TraceEventETWProvider::Resurrect();
+      tracelog = TraceEventETWProvider::GetInstance();
       ASSERT_TRUE(tracelog != NULL);
       ASSERT_FALSE(tracelog->IsTracing());
     }
 
     // Create the log file.
     ASSERT_TRUE(file_util::CreateTemporaryFile(&log_file_));
 
     // Create a private log session on the file.
     EtwTraceProperties prop;
     ASSERT_HRESULT_SUCCEEDED(prop.SetLoggerFileName(log_file_.value().c_str()));
@@ skipping 14 matching lines @@
     p.FlushTimer = 1;  // 1 second flush lag.
     ASSERT_HRESULT_SUCCEEDED(controller_.Start(kTestSessionName, &prop));
 
     // Enable the TraceLog provider GUID.
     ASSERT_HRESULT_SUCCEEDED(
         controller_.EnableProvider(kChromeTraceProviderName,
                                    TRACE_LEVEL_INFORMATION,
                                    0));
 
     if (is_xp) {
-      TraceLog::Resurrect();
-      tracelog = TraceLog::GetInstance();
+      TraceEventETWProvider::Resurrect();
+      tracelog = TraceEventETWProvider::GetInstance();
     }
     ASSERT_TRUE(tracelog != NULL);
     EXPECT_TRUE(tracelog->IsTracing());
   }
 
   void TearDown() {
     EtwTraceProperties prop;
     if (controller_.session() != 0)
       EXPECT_HRESULT_SUCCEEDED(controller_.Stop(&prop));
 
@@ skipping 48 matching lines @@
 }  // namespace
 
 
 TEST_F(TraceEventTest, TraceLog) {
   ExpectPlayLog();
 
   // The events should arrive in the same sequence as the expects.
   InSequence in_sequence;
 
   // Full argument version, passing lengths explicitly.
-  TraceLog::Trace(kName,
+  TraceEventETWProvider::Trace(kName,
                         strlen(kName),
-                        TraceLog::EVENT_BEGIN,
+                        base::debug::TRACE_EVENT_PHASE_BEGIN,
                         kId,
                         kExtra,
                         strlen(kExtra));
 
   ExpectEvent(kTraceEventClass32,
               kTraceEventTypeBegin,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
   // Const char* version.
-  TraceLog::Trace(static_cast<const char*>(kName),
-                        TraceLog::EVENT_END,
+  TraceEventETWProvider::Trace(static_cast<const char*>(kName),
+                        base::debug::TRACE_EVENT_PHASE_END,
                         kId,
                         static_cast<const char*>(kExtra));
 
   ExpectEvent(kTraceEventClass32,
               kTraceEventTypeEnd,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
   // std::string extra version.
-  TraceLog::Trace(static_cast<const char*>(kName),
-                        TraceLog::EVENT_INSTANT,
+  TraceEventETWProvider::Trace(static_cast<const char*>(kName),
+                        base::debug::TRACE_EVENT_PHASE_INSTANT,
                         kId,
                         std::string(kExtra));
 
   ExpectEvent(kTraceEventClass32,
               kTraceEventTypeInstant,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
 
   // Test for sanity on NULL inputs.
-  TraceLog::Trace(NULL,
+  TraceEventETWProvider::Trace(NULL,
                         0,
-                        TraceLog::EVENT_BEGIN,
+                        base::debug::TRACE_EVENT_PHASE_BEGIN,
                         kId,
                         NULL,
                         0);
 
   ExpectEvent(kTraceEventClass32,
               kTraceEventTypeBegin,
               kEmpty, 0,
               kId,
               kEmpty, 0);
 
-  TraceLog::Trace(NULL,
+  TraceEventETWProvider::Trace(NULL,
                         -1,
-                        TraceLog::EVENT_END,
+                        base::debug::TRACE_EVENT_PHASE_END,
                         kId,
                         NULL,
                         -1);
 
   ExpectEvent(kTraceEventClass32,
               kTraceEventTypeEnd,
               kEmpty, 0,
               kId,
               kEmpty, 0);
 
   PlayLog();
 }
 
 TEST_F(TraceEventTest, Macros) {
   ExpectPlayLog();
 
   // The events should arrive in the same sequence as the expects.
   InSequence in_sequence;
 
-  TRACE_EVENT_BEGIN(kName, kId, kExtra);
+  TRACE_EVENT_BEGIN_ETW(kName, kId, kExtra);
   ExpectEvent(kTraceEventClass32,
               kTraceEventTypeBegin,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
-  TRACE_EVENT_END(kName, kId, kExtra);
+  TRACE_EVENT_END_ETW(kName, kId, kExtra);
   ExpectEvent(kTraceEventClass32,
               kTraceEventTypeEnd,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
-  TRACE_EVENT_INSTANT(kName, kId, kExtra);
+  TRACE_EVENT_INSTANT_ETW(kName, kId, kExtra);
   ExpectEvent(kTraceEventClass32,
               kTraceEventTypeInstant,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
   PlayLog();
 }
 
 }  // namespace debug
 }  // namespace base