diff options
| author | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 22:44:34 +0000 |
|---|---|---|
| committer | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 22:44:34 +0000 |
| commit | b1b3e6a9382947bf30f5cee0ed87010f4c3a6530 (patch) | |
| tree | b69934fc42ec4bd14bad6b67fd3ad3b372e7b22d /base | |
| parent | 40be2019b4847656a11f0eaed72e3cef04e6feca (diff) | |
| download | chromium_src-b1b3e6a9382947bf30f5cee0ed87010f4c3a6530.zip chromium_src-b1b3e6a9382947bf30f5cee0ed87010f4c3a6530.tar.gz chromium_src-b1b3e6a9382947bf30f5cee0ed87010f4c3a6530.tar.bz2 | |
Revert 136990 - Make sure the thread calling CoCreateGuid is CoInitialized.
BUG=127671
TEST=Test passes on Vista test bots.
Review URL: https://chromiumcodereview.appspot.com/10383162
TBR=siggi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10382159
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/win/event_trace_consumer_unittest.cc | 5 | ||||
| -rw-r--r-- | base/win/event_trace_controller_unittest.cc | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/base/win/event_trace_consumer_unittest.cc b/base/win/event_trace_consumer_unittest.cc index e815776..d3ba0f3 100644 --- a/base/win/event_trace_consumer_unittest.cc +++ b/base/win/event_trace_consumer_unittest.cc @@ -18,7 +18,6 @@ #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" @@ -104,7 +103,6 @@ class EtwTraceConsumerBaseTest: public testing::Test { } protected: - base::win::ScopedCOMInitializer com_initializer_; GUID test_provider_; std::wstring session_name_; }; @@ -245,7 +243,8 @@ DEFINE_GUID(kTestEventType, } // namespace -TEST_F(EtwTraceConsumerRealtimeTest, ConsumeEvent) { +// Fails consistently on Vista. http://crbug.com/127671 +TEST_F(EtwTraceConsumerRealtimeTest, DISABLED_ConsumeEvent) { EtwTraceController controller; HRESULT hr = controller.StartRealtimeSession(session_name_.c_str(), 100 * 1024); diff --git a/base/win/event_trace_controller_unittest.cc b/base/win/event_trace_controller_unittest.cc index 223791c..2e3a403 100644 --- a/base/win/event_trace_controller_unittest.cc +++ b/base/win/event_trace_controller_unittest.cc @@ -17,7 +17,6 @@ #include "base/win/event_trace_controller.h" #include "base/win/event_trace_provider.h" #include "base/win/scoped_handle.h" -#include "base/win/scoped_com_initializer.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -129,7 +128,6 @@ class EtwTraceControllerTest : public testing::Test { } protected: - base::win::ScopedCOMInitializer com_initializer_; GUID test_provider_; std::wstring session_name_; }; |