Index: base/event_trace_controller_win_unittest.cc |
=================================================================== |
--- base/event_trace_controller_win_unittest.cc (revision 62730) |
+++ base/event_trace_controller_win_unittest.cc (working copy) |
@@ -42,7 +42,7 @@ |
virtual void OnEventsEnabled() { |
::SetEvent(callback_event_.Get()); |
} |
- virtual void OnEventsDisabled() { |
+ virtual void PostEventsDisabled() { |
::SetEvent(callback_event_.Get()); |
} |
@@ -55,7 +55,8 @@ |
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) { |
@@ -152,8 +153,7 @@ |
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()); |