diff options
| author | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 22:12:00 +0000 |
|---|---|---|
| committer | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 22:12:00 +0000 |
| commit | 363297bf93780e90078cb40ace036cd4c3518798 (patch) | |
| tree | d7710fb29c53c803eed213cc41f6f8661cc75a2c /base/win/event_trace_consumer_unittest.cc | |
| parent | 2aa5c54210872d3c5dab2a06816667b95300a2b8 (diff) | |
| download | chromium_src-363297bf93780e90078cb40ace036cd4c3518798.zip chromium_src-363297bf93780e90078cb40ace036cd4c3518798.tar.gz chromium_src-363297bf93780e90078cb40ace036cd4c3518798.tar.bz2 | |
Make sure the thread calling CoCreateGuid is CoInitialized.
BUG=127671
TEST=Test passes on Vista test bots.
Review URL: https://chromiumcodereview.appspot.com/10383162
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136990 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/win/event_trace_consumer_unittest.cc')
| -rw-r--r-- | base/win/event_trace_consumer_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/base/win/event_trace_consumer_unittest.cc b/base/win/event_trace_consumer_unittest.cc index d3ba0f3..e815776 100644 --- a/base/win/event_trace_consumer_unittest.cc +++ b/base/win/event_trace_consumer_unittest.cc @@ -18,6 +18,7 @@ #include "base/stringprintf.h" #include "base/win/event_trace_controller.h" #include "base/win/event_trace_provider.h" +#include "base/win/scoped_com_initializer.h" #include "base/win/scoped_handle.h" #include "testing/gtest/include/gtest/gtest.h" @@ -103,6 +104,7 @@ class EtwTraceConsumerBaseTest: public testing::Test { } protected: + base::win::ScopedCOMInitializer com_initializer_; GUID test_provider_; std::wstring session_name_; }; @@ -243,8 +245,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); |