content/browser/renderer_host/media/media_stream_ui_controller_unittest.cc - Issue 2132593002: Remove remaining calls to deprecated MessageLoop methods on Mac.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2132593002: Remove remaining calls to deprecated MessageLoop methods on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: h264_vt_encoder_unittest.cc Created 4 years, 5 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

« no previous file with comments | « components/translate/ios/browser/ios_translate_driver.mm ('k') | content/browser/renderer_host/media/video_capture_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/media_stream_ui_controller_unittest.cc

diff --git a/content/browser/renderer_host/media/media_stream_ui_controller_unittest.cc b/content/browser/renderer_host/media/media_stream_ui_controller_unittest.cc

index f0f93b476ad4d11ee09fd4f346d6322a0b5d39d1..94b96edca891072809328115a11226d9d0829072 100644

--- a/content/browser/renderer_host/media/media_stream_ui_controller_unittest.cc

+++ b/content/browser/renderer_host/media/media_stream_ui_controller_unittest.cc

@@ -7,6 +7,7 @@

#include "base/bind.h"

#include "base/macros.h"

#include "base/message_loop/message_loop.h"

+#include "base/run_loop.h"

#include "content/browser/browser_thread_impl.h"

#include "content/browser/renderer_host/media/media_stream_settings_requester.h"

#include "content/browser/renderer_host/media/media_stream_ui_controller.h"

@@ -52,9 +53,7 @@ class MediaStreamDeviceUIControllerTest

ui_controller_.reset(new MediaStreamUIController(this));

}

- virtual void TearDown() {

- message_loop_->RunUntilIdle();

- }

+ virtual void TearDown() { base::RunLoop().RunUntilIdle(); }

void CreateDummyRequest(const std::string& label, bool audio, bool video) {

int dummy_render_process_id = 1;

@@ -105,7 +104,7 @@ TEST_F(MediaStreamDeviceUIControllerTest, HandleRequestUsingFakeUI) {

// Remove the current request, it should not crash.

EXPECT_CALL(*this, DevicesAccepted(label, _));

- message_loop_->RunUntilIdle();

+ base::RunLoop().RunUntilIdle();

ui_controller_->NotifyUIIndicatorDevicesClosed(label);

}

@@ -132,7 +131,7 @@ TEST_F(MediaStreamDeviceUIControllerTest, CreateRequestsAndCancelTheFirst) {

EXPECT_CALL(*this, DevicesAccepted(label_2, _));

EXPECT_CALL(*this, DevicesAccepted(label_3, _));

- message_loop_->RunUntilIdle();

+ base::RunLoop().RunUntilIdle();

ui_controller_->NotifyUIIndicatorDevicesClosed(label_2);

ui_controller_->NotifyUIIndicatorDevicesClosed(label_3);

@@ -160,7 +159,7 @@ TEST_F(MediaStreamDeviceUIControllerTest, CreateRequestsAndCancelTheLast) {

EXPECT_CALL(*this, DevicesAccepted(label_1, _));

EXPECT_CALL(*this, DevicesAccepted(label_2, _));

- message_loop_->RunUntilIdle();

+ base::RunLoop().RunUntilIdle();

ui_controller_->NotifyUIIndicatorDevicesClosed(label_1);

ui_controller_->NotifyUIIndicatorDevicesClosed(label_2);