Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(556)

Unified Diff: base/event_trace_controller_win_unittest.cc

Issue 3800006: Fix event tracing for windows test flakyness.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/event_trace_controller_win.cc ('k') | base/event_trace_provider_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « base/event_trace_controller_win.cc ('k') | base/event_trace_provider_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698