summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorbrucedawson <brucedawson@chromium.org>2015-09-21 10:50:48 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-21 17:51:24 +0000
commit1a829413d5e40d132a83c31ba4a2b89a095216d2 (patch)
tree651bedd04d0e27dc4c4a79657bee924530264bd7 /base
parent49cb89ac2a9ac36d91f8e2411ae0aa7113207963 (diff)
downloadchromium_src-1a829413d5e40d132a83c31ba4a2b89a095216d2.zip
chromium_src-1a829413d5e40d132a83c31ba4a2b89a095216d2.tar.gz
chromium_src-1a829413d5e40d132a83c31ba4a2b89a095216d2.tar.bz2
Disable EtwTraceControllerTest.EnableDisable again
Spelling counts. DISABLE_ doesn't work as well as DISABLED_. Tested correctly this time to make sure it is actually disabled. R=danakj@chromium.org BUG=525297,534184 Review URL: https://codereview.chromium.org/1357733007 Cr-Commit-Position: refs/heads/master@{#349958}
Diffstat (limited to 'base')
-rw-r--r--base/win/event_trace_controller_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/win/event_trace_controller_unittest.cc b/base/win/event_trace_controller_unittest.cc
index 9a57041..625a92f 100644
--- a/base/win/event_trace_controller_unittest.cc
+++ b/base/win/event_trace_controller_unittest.cc
@@ -180,7 +180,7 @@ TEST_F(EtwTraceControllerTest, StartFileSession) {
}
// Disable until bug 525297 is fixed (hangs on Windows 7?)
-TEST_F(EtwTraceControllerTest, DISABLE_EnableDisable) {
+TEST_F(EtwTraceControllerTest, DISABLED_EnableDisable) {
TestingProvider provider(test_provider_);
EXPECT_EQ(ERROR_SUCCESS, provider.Register());