| Index: webrtc/pc/proxy_unittest.cc
|
| diff --git a/webrtc/pc/proxy_unittest.cc b/webrtc/pc/proxy_unittest.cc
|
| index c21599d351ec8395226ffca1cdaa3e0aff938e17..0d97c4174f01c31bad5ebf248742322bf9b6a765 100644
|
| --- a/webrtc/pc/proxy_unittest.cc
|
| +++ b/webrtc/pc/proxy_unittest.cc
|
| @@ -95,7 +95,7 @@
|
|
|
| protected:
|
| void SetUp() override {
|
| - signaling_thread_ = rtc::Thread::Create();
|
| + signaling_thread_.reset(new rtc::Thread());
|
| ASSERT_TRUE(signaling_thread_->Start());
|
| fake_ = Fake::Create();
|
| fake_signaling_proxy_ =
|
| @@ -182,8 +182,8 @@
|
|
|
| protected:
|
| void SetUp() override {
|
| - signaling_thread_ = rtc::Thread::Create();
|
| - worker_thread_ = rtc::Thread::Create();
|
| + signaling_thread_.reset(new rtc::Thread());
|
| + worker_thread_.reset(new rtc::Thread());
|
| ASSERT_TRUE(signaling_thread_->Start());
|
| ASSERT_TRUE(worker_thread_->Start());
|
| fake_ = Fake::Create();
|
| @@ -283,22 +283,20 @@
|
| class OwnedProxyTest : public testing::Test {
|
| public:
|
| OwnedProxyTest()
|
| - : signaling_thread_(rtc::Thread::Create()),
|
| - worker_thread_(rtc::Thread::Create()),
|
| - foo_(new Foo()),
|
| - foo_proxy_(FooProxy::Create(signaling_thread_.get(),
|
| - worker_thread_.get(),
|
| + : foo_(new Foo()),
|
| + foo_proxy_(FooProxy::Create(&signaling_thread_,
|
| + &worker_thread_,
|
| std::unique_ptr<FooInterface>(foo_))) {
|
| - signaling_thread_->Start();
|
| - worker_thread_->Start();
|
| + signaling_thread_.Start();
|
| + worker_thread_.Start();
|
| }
|
|
|
| - void CheckSignalingThread() { EXPECT_TRUE(signaling_thread_->IsCurrent()); }
|
| - void CheckWorkerThread() { EXPECT_TRUE(worker_thread_->IsCurrent()); }
|
| -
|
| - protected:
|
| - std::unique_ptr<rtc::Thread> signaling_thread_;
|
| - std::unique_ptr<rtc::Thread> worker_thread_;
|
| + void CheckSignalingThread() { EXPECT_TRUE(signaling_thread_.IsCurrent()); }
|
| + void CheckWorkerThread() { EXPECT_TRUE(worker_thread_.IsCurrent()); }
|
| +
|
| + protected:
|
| + rtc::Thread signaling_thread_;
|
| + rtc::Thread worker_thread_;
|
| Foo* foo_; // Owned by foo_proxy_, not this class.
|
| std::unique_ptr<FooInterface> foo_proxy_;
|
| };
|
|
|