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

Unified Diff: content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc

Issue 2082343002: Remove calls to deprecated MessageLoop methods in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CR 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: content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc
diff --git a/content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc b/content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc
index 0491a0c2aa45e856d1efd4809564ab5dbdf4db11..9fd8b7e48881e56bac6ccff4cc605c681669d7d3 100644
--- a/content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc
+++ b/content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc
@@ -7,6 +7,7 @@
#include <utility>
#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "content/browser/frame_host/render_frame_host_delegate.h"
#include "content/public/test/test_browser_thread.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -64,7 +65,7 @@ class MediaStreamUIProxyTest : public testing::Test {
~MediaStreamUIProxyTest() override {
proxy_.reset();
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
protected:
@@ -103,7 +104,7 @@ TEST_F(MediaStreamUIProxyTest, Deny) {
EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request_ptr),
_))
.WillOnce(SaveArg<1>(&callback));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ASSERT_FALSE(callback.is_null());
MediaStreamDevices devices;
@@ -112,7 +113,7 @@ TEST_F(MediaStreamUIProxyTest, Deny) {
MediaStreamDevices response;
EXPECT_CALL(response_callback_, OnAccessRequestResponse(_, _))
.WillOnce(SaveArg<0>(&response));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(response.empty());
}
@@ -131,7 +132,7 @@ TEST_F(MediaStreamUIProxyTest, AcceptAndStart) {
EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request_ptr),
_))
.WillOnce(SaveArg<1>(&callback));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ASSERT_FALSE(callback.is_null());
MediaStreamDevices devices;
@@ -144,12 +145,12 @@ TEST_F(MediaStreamUIProxyTest, AcceptAndStart) {
MediaStreamDevices response;
EXPECT_CALL(response_callback_, OnAccessRequestResponse(_, _))
.WillOnce(SaveArg<0>(&response));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(response.empty());
proxy_->OnStarted(base::Closure(), MediaStreamUIProxy::WindowIdCallback());
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
// Verify that the proxy can be deleted before the request is processed.
@@ -167,7 +168,7 @@ TEST_F(MediaStreamUIProxyTest, DeleteBeforeAccepted) {
EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request_ptr)
, _))
.WillOnce(SaveArg<1>(&callback));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ASSERT_FALSE(callback.is_null());
proxy_.reset();
@@ -191,7 +192,7 @@ TEST_F(MediaStreamUIProxyTest, StopFromUI) {
EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request_ptr)
, _))
.WillOnce(SaveArg<1>(&callback));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ASSERT_FALSE(callback.is_null());
base::Closure stop_callback;
@@ -207,7 +208,7 @@ TEST_F(MediaStreamUIProxyTest, StopFromUI) {
MediaStreamDevices response;
EXPECT_CALL(response_callback_, OnAccessRequestResponse(_, _))
.WillOnce(SaveArg<0>(&response));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(response.empty());
@@ -215,12 +216,12 @@ TEST_F(MediaStreamUIProxyTest, StopFromUI) {
proxy_->OnStarted(base::Bind(&MockStopStreamHandler::OnStop,
base::Unretained(&stop_handler)),
MediaStreamUIProxy::WindowIdCallback());
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ASSERT_FALSE(stop_callback.is_null());
EXPECT_CALL(stop_handler, OnStop());
stop_callback.Run();
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
TEST_F(MediaStreamUIProxyTest, WindowIdCallbackCalled) {
@@ -238,7 +239,7 @@ TEST_F(MediaStreamUIProxyTest, WindowIdCallbackCalled) {
EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request_ptr),
_))
.WillOnce(SaveArg<1>(&callback));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
const int kWindowId = 1;
std::unique_ptr<MockMediaStreamUI> ui(new MockMediaStreamUI());
@@ -254,7 +255,7 @@ TEST_F(MediaStreamUIProxyTest, WindowIdCallbackCalled) {
base::Bind(&MockStopStreamHandler::OnStop, base::Unretained(&handler)),
base::Bind(&MockStopStreamHandler::OnWindowId,
base::Unretained(&handler)));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
TEST_F(MediaStreamUIProxyTest, CheckAccess) {
@@ -264,7 +265,7 @@ TEST_F(MediaStreamUIProxyTest, CheckAccess) {
base::Unretained(&response_callback_)));
EXPECT_CALL(delegate_, CheckMediaAccessPermission(_, _));
EXPECT_CALL(response_callback_, OnCheckResponse(_));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698