diff --git a/webrtc/base/thread.cc b/webrtc/base/thread.cc index 66542bb3d9..b5be475fb3 100644 --- a/webrtc/base/thread.cc +++ b/webrtc/base/thread.cc @@ -518,21 +518,4 @@ AutoThread::~AutoThread() { } } -#if defined(WEBRTC_WIN) -ComThread::~ComThread() { - Stop(); -} - -void ComThread::Run() { - HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED); - RTC_DCHECK(SUCCEEDED(hr)); - if (SUCCEEDED(hr)) { - Thread::Run(); - CoUninitialize(); - } else { - LOG(LS_ERROR) << "CoInitialize failed, hr=" << hr; - } -} -#endif - } // namespace rtc diff --git a/webrtc/base/thread.h b/webrtc/base/thread.h index 398063d263..01c80501c8 100644 --- a/webrtc/base/thread.h +++ b/webrtc/base/thread.h @@ -306,21 +306,6 @@ class AutoThread : public Thread { RTC_DISALLOW_COPY_AND_ASSIGN(AutoThread); }; -// Win32 extension for threads that need to use COM -#if defined(WEBRTC_WIN) -class ComThread : public Thread { - public: - ComThread() {} - ~ComThread() override; - - protected: - void Run() override; - - private: - RTC_DISALLOW_COPY_AND_ASSIGN(ComThread); -}; -#endif - // Provides an easy way to install/uninstall a socketserver on a thread. class SocketServerScope { public: diff --git a/webrtc/base/thread_unittest.cc b/webrtc/base/thread_unittest.cc index 39f2b2e2cc..35ea60468c 100644 --- a/webrtc/base/thread_unittest.cc +++ b/webrtc/base/thread_unittest.cc @@ -413,12 +413,6 @@ TEST(ThreadTest, SetNameOnSignalQueueDestroyed) { Thread* thread2 = new AutoThread(); SetNameOnSignalQueueDestroyedTester tester2(thread2); delete thread2; - -#if defined(WEBRTC_WIN) - Thread* thread3 = new ComThread(); - SetNameOnSignalQueueDestroyedTester tester3(thread3); - delete thread3; -#endif } class AsyncInvokeTest : public testing::Test { @@ -781,29 +775,3 @@ TEST_F(GuardedAsyncInvokeTest, FlushWithIds) { EXPECT_FALSE(flag1.get()); EXPECT_TRUE(flag2.get()); } - -#if defined(WEBRTC_WIN) -class ComThreadTest : public testing::Test, public MessageHandler { - public: - ComThreadTest() : done_(false) {} - protected: - virtual void OnMessage(Message* message) { - HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED); - // S_FALSE means the thread was already inited for a multithread apartment. - EXPECT_EQ(S_FALSE, hr); - if (SUCCEEDED(hr)) { - CoUninitialize(); - } - done_ = true; - } - bool done_; -}; - -TEST_F(ComThreadTest, ComInited) { - Thread* thread = new ComThread(); - EXPECT_TRUE(thread->Start()); - thread->Post(RTC_FROM_HERE, this, 0); - EXPECT_TRUE_WAIT(done_, 1000); - delete thread; -} -#endif