Fix event tracing for windows test flakyness....

base/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/trace_event.h"
 
 #include <strstream>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
@@ skipping 61 matching lines @@
   static TestEventConsumer* current_;
 };
 
 TestEventConsumer* TestEventConsumer::current_ = NULL;
 
 class TraceEventTest: public testing::Test {
  public:
   void SetUp() {
     bool is_xp = base::win::GetVersion() < base::win::VERSION_VISTA;
 
+    if (is_xp) {
+      // 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.
     if (!is_xp) {
       base::TraceLog::Resurrect();
       base::TraceLog* tracelog = base::TraceLog::Get();
       ASSERT_TRUE(tracelog != NULL);
     }
@@ skipping 155 matching lines @@
 
   ExpectEvent(base::kTraceEventClass32,
               base::kTraceEventTypeEnd,
               kEmpty, 0,
               kId,
               kEmpty, 0);
 
   PlayLog();
 }
 
-// Marked flaky per http://crbug.com/52388
-TEST_F(TraceEventTest, FLAKY_Macros) {
+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);
   ExpectEvent(base::kTraceEventClass32,
               base::kTraceEventTypeBegin,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
   TRACE_EVENT_END(kName, kId, kExtra);
   ExpectEvent(base::kTraceEventClass32,
               base::kTraceEventTypeEnd,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
   TRACE_EVENT_INSTANT(kName, kId, kExtra);
   ExpectEvent(base::kTraceEventClass32,
               base::kTraceEventTypeInstant,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
   PlayLog();
 }