Fix event tracing for windows test flakyness....

base/event_trace_consumer_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.
 //
 // Unit tests for event trace consumer_ base class.
 #include "base/event_trace_consumer_win.h"
 #include <list>
 #include "base/basictypes.h"
 #include "base/event_trace_controller_win.h"
 #include "base/event_trace_provider_win.h"
@@ skipping 54 matching lines @@
 };
 
 ScopedHandle TestConsumer::sank_event_;
 EventQueue TestConsumer::events_;
 
 const wchar_t* const kTestSessionName = L"TestLogSession";
 
 class EtwTraceConsumerBaseTest: public testing::Test {
  public:
   virtual void SetUp() {
-    EtwTraceController::Stop(kTestSessionName, NULL);
+    EtwTraceProperties ignore;
+    EtwTraceController::Stop(kTestSessionName, &ignore);
   }
 };
 
 }  // namespace
 
 TEST_F(EtwTraceConsumerBaseTest, Initialize) {
   TestConsumer consumer_;
 }
 
 TEST_F(EtwTraceConsumerBaseTest, OpenRealtimeSucceedsWhenNoSession) {
@@ skipping 152 matching lines @@
 namespace {
 
 // We run events through a file session to assert that
 // the content comes through.
 class EtwTraceConsumerDataTest: public testing::Test {
  public:
   EtwTraceConsumerDataTest() {
   }
 
   virtual void SetUp() {
-    EtwTraceController::Stop(kTestSessionName, NULL);
+    EtwTraceProperties prop;
+    EtwTraceController::Stop(kTestSessionName, &prop);
     // Construct a temp file name.
     ASSERT_TRUE(file_util::CreateTemporaryFile(&temp_file_));
   }
 
   virtual void TearDown() {
     EXPECT_TRUE(file_util::Delete(temp_file_, false));
-    EtwTraceController::Stop(kTestSessionName, NULL);
+    EtwTraceProperties ignore;
+    EtwTraceController::Stop(kTestSessionName, &ignore);
   }
 
   HRESULT LogEventToTempSession(PEVENT_TRACE_HEADER header) {
     EtwTraceController controller;
 
     // Set up a file session.
     HRESULT hr = controller.StartFileSession(kTestSessionName,
                                              temp_file_.value().c_str());
     if (FAILED(hr))
       return hr;
@@ skipping 62 matching lines @@
   PEVENT_TRACE trace = NULL;
   HRESULT hr = RoundTripEvent(&event.header, &trace);
   if (hr == E_ACCESSDENIED) {
     LOG(INFO) << "You must be an administrator to run this test on Vista";
     return;
   }
   ASSERT_TRUE(NULL != trace);
   ASSERT_EQ(sizeof(kData), trace->MofLength);
   ASSERT_STREQ(kData, reinterpret_cast<const char*>(trace->MofData));
 }