Revert 136990 - Make sure the thread calling CoCreateGuid is CoInitialized.

base/win/event_trace_consumer_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 consumer base class.
 #include "base/win/event_trace_consumer.h"
 
 #include <list>
 
 #include <objbase.h>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/process.h"
 #include "base/scoped_temp_dir.h"
 #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"
 
 #include <initguid.h>  // NOLINT - has to be last
 
 namespace {
 
 using base::win::EtwMofEvent;
 using base::win::EtwTraceController;
 using base::win::EtwTraceConsumerBase;
@@ skipping 65 matching lines @@
     ASSERT_HRESULT_SUCCEEDED(::CoCreateGuid(&test_provider_));
   }
 
   virtual void TearDown() {
     // Cleanup any potentially danging sessions.
     EtwTraceProperties ignore;
     EtwTraceController::Stop(session_name_.c_str(), &ignore);
   }
 
  protected:
-  base::win::ScopedCOMInitializer com_initializer_;
   GUID test_provider_;
   std::wstring session_name_;
 };
 
 }  // namespace
 
 TEST_F(EtwTraceConsumerBaseTest, Initialize) {
   TestConsumer consumer_;
 }
 
@@ skipping 120 matching lines @@
 }
 
 namespace {
 
 // {57E47923-A549-476f-86CA-503D57F59E62}
 DEFINE_GUID(kTestEventType,
   0x57e47923, 0xa549, 0x476f, 0x86, 0xca, 0x50, 0x3d, 0x57, 0xf5, 0x9e, 0x62);
 
 }  // 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);
   if (hr == E_ACCESSDENIED) {
     VLOG(1) << "You must be an administrator to run this test on Vista";
     return;
   }
 
   ASSERT_HRESULT_SUCCEEDED(controller.EnableProvider(test_provider_,
       TRACE_LEVEL_VERBOSE, 0xFFFFFFFF));
@@ skipping 116 matching lines @@
   HRESULT hr = RoundTripEvent(&event.header, &trace);
   if (hr == E_ACCESSDENIED) {
     VLOG(1) << "You must be an administrator to run this test on Vista";
     return;
   }
   ASSERT_HRESULT_SUCCEEDED(hr) << "RoundTripEvent failed";
   ASSERT_TRUE(NULL != trace);
   ASSERT_EQ(sizeof(kData), trace->MofLength);
   ASSERT_STREQ(kData, reinterpret_cast<const char*>(trace->MofData));
 }