Fix event tracing for windows test flakyness....

base/event_trace_controller_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 controller.
 #include "base/event_trace_controller_win.h"
 #include "base/event_trace_provider_win.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 24 matching lines @@
 
   void WaitForCallback() {
     ::WaitForSingleObject(callback_event_.Get(), INFINITE);
     ::ResetEvent(callback_event_.Get());
   }
 
  private:
   virtual void OnEventsEnabled() {
     ::SetEvent(callback_event_.Get());
   }
-  virtual void OnEventsDisabled() {
+  virtual void PostEventsDisabled() {
     ::SetEvent(callback_event_.Get());
   }
 
   ScopedHandle callback_event_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingProvider);
 };
 
 }  // namespace
 
 TEST(EtwTraceTest, Cleanup) {
   // Clean up potential leftover sessions from previous unsuccessful runs.
-  EtwTraceController::Stop(kTestSessionName, NULL);
+  EtwTraceProperties ignore;
+  EtwTraceController::Stop(kTestSessionName, &ignore);
 }
 
 TEST(EtwTracePropertiesTest, Initialization) {
   EtwTraceProperties prop;
 
   EVENT_TRACE_PROPERTIES* p = prop.get();
   EXPECT_NE(0u, p->Wnode.BufferSize);
   EXPECT_EQ(0u, p->Wnode.ProviderId);
   EXPECT_EQ(0u, p->Wnode.HistoricalContext);
 
@@ skipping 76 matching lines @@
   }
 
   EXPECT_TRUE(NULL != controller.session());
   EXPECT_STREQ(kTestSessionName, controller.session_name());
 
   EXPECT_HRESULT_SUCCEEDED(controller.Stop(NULL));
   EXPECT_EQ(NULL, controller.session());
   EXPECT_STREQ(L"", controller.session_name());
 }
 
-// Flaky, http://crbug.com/59328.
-TEST(EtwTraceControllerTest, FLAKY_EnableDisable) {
+TEST(EtwTraceControllerTest, EnableDisable) {
   TestingProvider provider(kTestProvider);
 
   EXPECT_EQ(ERROR_SUCCESS, provider.Register());
   EXPECT_EQ(NULL, provider.session_handle());
 
   EtwTraceController controller;
   HRESULT hr = controller.StartRealtimeSession(kTestSessionName, 100 * 1024);
   if (hr == E_ACCESSDENIED) {
     LOG(INFO) << "You must be an administrator to run this test on Vista";
     return;
@@ skipping 28 matching lines @@
   EXPECT_EQ(kTestProviderFlags, provider.enable_flags());
 
   EXPECT_HRESULT_SUCCEEDED(controller.Stop(NULL));
 
   provider.WaitForCallback();
 
   // Session should have wound down.
   EXPECT_EQ(0, provider.enable_level());
   EXPECT_EQ(0, provider.enable_flags());
 }