From d08baed84e8aed2343a697c6d1627d3b456e3e02 Mon Sep 17 00:00:00 2001 From: "erikchen@chromium.org" Date: Thu, 31 Jul 2014 23:50:09 +0000 Subject: Revert "Update webrtc&libjingle 6774:6799." This reverts commit bf45dff0ca703e5ad3bb6c6754ebdcb0c1b1296a. (https://codereview.chromium.org/429253003) Broke sizes on Linux http://build.chromium.org/p/chromium/builders/Linux/builds/51786 https://code.google.com/p/webrtc/source/browse/trunk/webrtc/base/linux.cc defines static std::string lsb_release_string; among other things It's guarded in WEBRTC_CHROMIUM_BUILDs. Maybe it should be WEBRTC_CHROMIUM_BUILD. BUG=NONE TBR=darin@chromium.org, hclam@chromium.org, jochen@chromium.org, palmer@chromium.org, sergeyu@chromium.org, wez@chromium.org, ronghuawu@chromium.org NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/435823002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286914 0039d316-1c4b-4281-b951-d872f2087c98 --- jingle/glue/thread_wrapper_unittest.cc | 46 +++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'jingle/glue/thread_wrapper_unittest.cc') diff --git a/jingle/glue/thread_wrapper_unittest.cc b/jingle/glue/thread_wrapper_unittest.cc index 8eabe98..3657780 100644 --- a/jingle/glue/thread_wrapper_unittest.cc +++ b/jingle/glue/thread_wrapper_unittest.cc @@ -28,9 +28,9 @@ static const int kMaxTestDelay = 40; namespace { -class MockMessageHandler : public rtc::MessageHandler { +class MockMessageHandler : public talk_base::MessageHandler { public: - MOCK_METHOD1(OnMessage, void(rtc::Message* msg)); + MOCK_METHOD1(OnMessage, void(talk_base::Message* msg)); }; MATCHER_P3(MatchMessage, handler, message_id, data, "") { @@ -66,7 +66,7 @@ class ThreadWrapperTest : public testing::Test { // This method is used by the SendDuringSend test. It sends message to the // main thread synchronously using Send(). void PingMainThread() { - rtc::MessageData* data = new rtc::MessageData(); + talk_base::MessageData* data = new talk_base::MessageData(); MockMessageHandler handler; EXPECT_CALL(handler, OnMessage( @@ -82,21 +82,21 @@ class ThreadWrapperTest : public testing::Test { virtual void SetUp() OVERRIDE { JingleThreadWrapper::EnsureForCurrentMessageLoop(); - thread_ = rtc::Thread::Current(); + thread_ = talk_base::Thread::Current(); } // ThreadWrapper destroyes itself when |message_loop_| is destroyed. base::MessageLoop message_loop_; - rtc::Thread* thread_; + talk_base::Thread* thread_; MockMessageHandler handler1_; MockMessageHandler handler2_; }; TEST_F(ThreadWrapperTest, Post) { - rtc::MessageData* data1 = new rtc::MessageData(); - rtc::MessageData* data2 = new rtc::MessageData(); - rtc::MessageData* data3 = new rtc::MessageData(); - rtc::MessageData* data4 = new rtc::MessageData(); + talk_base::MessageData* data1 = new talk_base::MessageData(); + talk_base::MessageData* data2 = new talk_base::MessageData(); + talk_base::MessageData* data3 = new talk_base::MessageData(); + talk_base::MessageData* data4 = new talk_base::MessageData(); thread_->Post(&handler1_, kTestMessage1, data1); thread_->Post(&handler1_, kTestMessage2, data2); @@ -122,10 +122,10 @@ TEST_F(ThreadWrapperTest, Post) { } TEST_F(ThreadWrapperTest, PostDelayed) { - rtc::MessageData* data1 = new rtc::MessageData(); - rtc::MessageData* data2 = new rtc::MessageData(); - rtc::MessageData* data3 = new rtc::MessageData(); - rtc::MessageData* data4 = new rtc::MessageData(); + talk_base::MessageData* data1 = new talk_base::MessageData(); + talk_base::MessageData* data2 = new talk_base::MessageData(); + talk_base::MessageData* data3 = new talk_base::MessageData(); + talk_base::MessageData* data4 = new talk_base::MessageData(); thread_->PostDelayed(kTestDelayMs1, &handler1_, kTestMessage1, data1); thread_->PostDelayed(kTestDelayMs2, &handler1_, kTestMessage2, data2); @@ -164,7 +164,7 @@ TEST_F(ThreadWrapperTest, Clear) { InSequence in_seq; - rtc::MessageData* null_data = NULL; + talk_base::MessageData* null_data = NULL; EXPECT_CALL(handler1_, OnMessage( MatchMessage(&handler1_, kTestMessage1, null_data))) .WillOnce(DeleteMessageData()); @@ -188,7 +188,7 @@ TEST_F(ThreadWrapperTest, ClearDelayed) { InSequence in_seq; - rtc::MessageData* null_data = NULL; + talk_base::MessageData* null_data = NULL; EXPECT_CALL(handler1_, OnMessage( MatchMessage(&handler1_, kTestMessage1, null_data))) .WillOnce(DeleteMessageData()); @@ -214,15 +214,15 @@ TEST_F(ThreadWrapperTest, ClearDestoroyed) { handler_ptr = &handler; thread_->Post(&handler, kTestMessage1, NULL); } - rtc::MessageList removed; - thread_->Clear(handler_ptr, rtc::MQID_ANY, &removed); + talk_base::MessageList removed; + thread_->Clear(handler_ptr, talk_base::MQID_ANY, &removed); DCHECK_EQ(0U, removed.size()); } // Verify that Send() calls handler synchronously when called on the // same thread. TEST_F(ThreadWrapperTest, SendSameThread) { - rtc::MessageData* data = new rtc::MessageData(); + talk_base::MessageData* data = new talk_base::MessageData(); EXPECT_CALL(handler1_, OnMessage( MatchMessage(&handler1_, kTestMessage1, data))) @@ -230,7 +230,7 @@ TEST_F(ThreadWrapperTest, SendSameThread) { thread_->Send(&handler1_, kTestMessage1, data); } -void InitializeWrapperForNewThread(rtc::Thread** thread, +void InitializeWrapperForNewThread(talk_base::Thread** thread, base::WaitableEvent* done_event) { JingleThreadWrapper::EnsureForCurrentMessageLoop(); JingleThreadWrapper::current()->set_send_allowed(true); @@ -247,7 +247,7 @@ TEST_F(ThreadWrapperTest, SendToOtherThread) { second_thread.Start(); base::WaitableEvent initialized_event(true, false); - rtc::Thread* target; + talk_base::Thread* target; second_thread.message_loop()->PostTask( FROM_HERE, base::Bind(&InitializeWrapperForNewThread, &target, &initialized_event)); @@ -255,7 +255,7 @@ TEST_F(ThreadWrapperTest, SendToOtherThread) { ASSERT_TRUE(target != NULL); - rtc::MessageData* data = new rtc::MessageData(); + talk_base::MessageData* data = new talk_base::MessageData(); EXPECT_CALL(handler1_, OnMessage( MatchMessage(&handler1_, kTestMessage1, data))) @@ -276,7 +276,7 @@ TEST_F(ThreadWrapperTest, SendDuringSend) { second_thread.Start(); base::WaitableEvent initialized_event(true, false); - rtc::Thread* target; + talk_base::Thread* target; second_thread.message_loop()->PostTask( FROM_HERE, base::Bind(&InitializeWrapperForNewThread, &target, &initialized_event)); @@ -284,7 +284,7 @@ TEST_F(ThreadWrapperTest, SendDuringSend) { ASSERT_TRUE(target != NULL); - rtc::MessageData* data = new rtc::MessageData(); + talk_base::MessageData* data = new talk_base::MessageData(); EXPECT_CALL(handler1_, OnMessage( MatchMessage(&handler1_, kTestMessage1, data))) -- cgit v1.1