diff options
| author | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 15:03:52 +0000 |
|---|---|---|
| committer | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 15:03:52 +0000 |
| commit | abd02159f62aa7e6a585ece6f2af01fac4ca4fa1 (patch) | |
| tree | 65e27f00ea5d9f2e90fdafeef2f3ee1ff5941d92 | |
| parent | 0ef3a52b5467e3eb07d0f6b7fb59ee9c6a775015 (diff) | |
| download | chromium_src-abd02159f62aa7e6a585ece6f2af01fac4ca4fa1.zip chromium_src-abd02159f62aa7e6a585ece6f2af01fac4ca4fa1.tar.gz chromium_src-abd02159f62aa7e6a585ece6f2af01fac4ca4fa1.tar.bz2 | |
Fix EtwTraceConsumerRealtimeTest.
The EtwTraceConsumerRealtimeTest test fixture subclass contained a second instance of the
test_provider_ member variable. This occluded the initialized superclass instance's variable
and led to the test relying on uninitialized data.
BUG=127671
TEST=Unittests pass on Vista.
Review URL: https://chromiumcodereview.appspot.com/10386141
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137129 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/win/event_trace_consumer_unittest.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/base/win/event_trace_consumer_unittest.cc b/base/win/event_trace_consumer_unittest.cc index d3ba0f3..b7ff482 100644 --- a/base/win/event_trace_consumer_unittest.cc +++ b/base/win/event_trace_consumer_unittest.cc @@ -206,7 +206,6 @@ class EtwTraceConsumerRealtimeTest: public EtwTraceConsumerBaseTest { } TestConsumer consumer_; - GUID test_provider_; base::win::ScopedHandle consumer_ready_; base::win::ScopedHandle consumer_thread_; }; @@ -243,8 +242,7 @@ DEFINE_GUID(kTestEventType, } // namespace -// Fails consistently on Vista. http://crbug.com/127671 -TEST_F(EtwTraceConsumerRealtimeTest, DISABLED_ConsumeEvent) { +TEST_F(EtwTraceConsumerRealtimeTest, ConsumeEvent) { EtwTraceController controller; HRESULT hr = controller.StartRealtimeSession(session_name_.c_str(), 100 * 1024); |