Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(358)

Unified Diff: jingle/glue/thread_wrapper_unittest.cc

Issue 2082353002: Remove calls to deprecated MessageLoop methods in jingle. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: jingle/glue/thread_wrapper_unittest.cc
diff --git a/jingle/glue/thread_wrapper_unittest.cc b/jingle/glue/thread_wrapper_unittest.cc
index 4725b6cbf4ee0f115f1df92747fd22f70084343a..bc1e8c2477cba85f9ad44f5bb1be14fad3b2137e 100644
--- a/jingle/glue/thread_wrapper_unittest.cc
+++ b/jingle/glue/thread_wrapper_unittest.cc
@@ -7,6 +7,8 @@
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
+#include "base/single_thread_task_runner.h"
#include "base/threading/thread.h"
#include "jingle/glue/thread_wrapper.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -120,7 +122,7 @@ TEST_F(ThreadWrapperTest, Post) {
MatchMessage(&handler2_, kTestMessage1, data4)))
.WillOnce(DeleteMessageData());
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
TEST_F(ThreadWrapperTest, PostDelayed) {
@@ -153,10 +155,10 @@ TEST_F(ThreadWrapperTest, PostDelayed) {
MatchMessage(&handler2_, kTestMessage1, data4)))
.WillOnce(DeleteMessageData());
- message_loop_.PostDelayedTask(
+ message_loop_.task_runner()->PostDelayedTask(
FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
base::TimeDelta::FromMilliseconds(kMaxTestDelay));
- message_loop_.Run();
+ base::RunLoop().Run();
}
TEST_F(ThreadWrapperTest, Clear) {
@@ -180,7 +182,7 @@ TEST_F(ThreadWrapperTest, Clear) {
MatchMessage(&handler2_, kTestMessage2, null_data)))
.WillOnce(DeleteMessageData());
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
TEST_F(ThreadWrapperTest, ClearDelayed) {
@@ -208,10 +210,10 @@ TEST_F(ThreadWrapperTest, ClearDelayed) {
MatchMessage(&handler2_, kTestMessage1, null_data)))
.WillOnce(DeleteMessageData());
- message_loop_.PostDelayedTask(
+ message_loop_.task_runner()->PostDelayedTask(
FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
base::TimeDelta::FromMilliseconds(kMaxTestDelay));
- message_loop_.Run();
+ base::RunLoop().Run();
}
// Verify that the queue is cleared when a handler is destroyed.
@@ -258,9 +260,9 @@ TEST_F(ThreadWrapperTest, SendToOtherThread) {
base::WaitableEvent::ResetPolicy::MANUAL,
base::WaitableEvent::InitialState::NOT_SIGNALED);
rtc::Thread* target;
- second_thread.message_loop()->PostTask(
- FROM_HERE, base::Bind(&InitializeWrapperForNewThread,
- &target, &initialized_event));
+ second_thread.task_runner()->PostTask(
+ FROM_HERE,
+ base::Bind(&InitializeWrapperForNewThread, &target, &initialized_event));
initialized_event.Wait();
ASSERT_TRUE(target != NULL);
@@ -289,9 +291,9 @@ TEST_F(ThreadWrapperTest, SendDuringSend) {
base::WaitableEvent::ResetPolicy::MANUAL,
base::WaitableEvent::InitialState::NOT_SIGNALED);
rtc::Thread* target;
- second_thread.message_loop()->PostTask(
- FROM_HERE, base::Bind(&InitializeWrapperForNewThread,
- &target, &initialized_event));
+ second_thread.task_runner()->PostTask(
+ FROM_HERE,
+ base::Bind(&InitializeWrapperForNewThread, &target, &initialized_event));
initialized_event.Wait();
ASSERT_TRUE(target != NULL);
@@ -313,7 +315,7 @@ TEST_F(ThreadWrapperTest, Dispose) {
bool deleted_ = false;
thread_->Dispose(new DeletableObject(&deleted_));
EXPECT_FALSE(deleted_);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(deleted_);
}

Powered by Google App Engine
This is Rietveld 408576698