Disable EtwTraceControllerTest.EnableDisable again

base/win/event_trace_controller_unittest.cc

 // Copyright (c) 2012 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 <objbase.h>
 #include <initguid.h>
 
 #include "base/files/file_path.h"
@@ skipping 162 matching lines @@
   EXPECT_TRUE(NULL != controller.session());
   EXPECT_STREQ(session_name_.c_str(), controller.session_name());
 
   EXPECT_HRESULT_SUCCEEDED(controller.Stop(NULL));
   EXPECT_EQ(NULL, controller.session());
   EXPECT_STREQ(L"", controller.session_name());
   base::DeleteFile(temp, false);
 }
 
 // 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());
   EXPECT_EQ(NULL, provider.session_handle());
 
   EtwTraceController controller;
   HRESULT hr = controller.StartRealtimeSession(session_name_.c_str(),
                                                100 * 1024);
   if (hr == E_ACCESSDENIED) {
     VLOG(1) << "You must be an administrator to run this test on Vista";
@@ skipping 35 matching lines @@
 
   provider.WaitForCallback();
 
   // Session should have wound down.
   EXPECT_EQ(0, provider.enable_level());
   EXPECT_EQ(0, provider.enable_flags());
 }
 
 }  // namespace win
 }  // namespace base