trace_event: distinguish between scoped begin/end and global start/finish events

base/debug/trace_event_win_unittest.cc

 // Copyright (c) 2011 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"
@@ skipping 198 matching lines @@
 
 TEST_F(TraceEventWinTest, TraceLog) {
   ExpectPlayLog();
 
   // The events should arrive in the same sequence as the expects.
   InSequence in_sequence;
 
   // Full argument version, passing lengths explicitly.
   TraceEventETWProvider::Trace(kName,
                         strlen(kName),
-                        base::debug::TRACE_EVENT_PHASE_BEGIN,
+                        TRACE_EVENT_PHASE_BEGIN,
                         kId,
                         kExtra,
                         strlen(kExtra));
 
   ExpectEvent(kTraceEventClass32,
               kTraceEventTypeBegin,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
   // Const char* version.
   TraceEventETWProvider::Trace(static_cast<const char*>(kName),
-                        base::debug::TRACE_EVENT_PHASE_END,
+                        TRACE_EVENT_PHASE_END,
                         kId,
                         static_cast<const char*>(kExtra));
 
   ExpectEvent(kTraceEventClass32,
               kTraceEventTypeEnd,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
   // std::string extra version.
   TraceEventETWProvider::Trace(static_cast<const char*>(kName),
-                        base::debug::TRACE_EVENT_PHASE_INSTANT,
+                        TRACE_EVENT_PHASE_INSTANT,
                         kId,
                         std::string(kExtra));
 
   ExpectEvent(kTraceEventClass32,
               kTraceEventTypeInstant,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
 
   // Test for sanity on NULL inputs.
   TraceEventETWProvider::Trace(NULL,
                         0,
-                        base::debug::TRACE_EVENT_PHASE_BEGIN,
+                        TRACE_EVENT_PHASE_BEGIN,
                         kId,
                         NULL,
                         0);
 
   ExpectEvent(kTraceEventClass32,
               kTraceEventTypeBegin,
               kEmpty, 0,
               kId,
               kEmpty, 0);
 
   TraceEventETWProvider::Trace(NULL,
                         -1,
-                        base::debug::TRACE_EVENT_PHASE_END,
+                        TRACE_EVENT_PHASE_END,
                         kId,
                         NULL,
                         -1);
 
   ExpectEvent(kTraceEventClass32,
               kTraceEventTypeEnd,
               kEmpty, 0,
               kId,
               kEmpty, 0);
 
@@ skipping 25 matching lines @@
               kTraceEventTypeInstant,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
   PlayLog();
 }
 
 }  // namespace debug
 }  // namespace base