content/browser/renderer_host/media/media_stream_manager_unittest.cc - Issue 88283002: Reland review 34393006: Refactor MediaStreamManager to not output real device id.

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_manager_unittest.cc

Issue 88283002: Reland review 34393006: Refactor MediaStreamManager to not output real device id. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Changes since the revert. Created 7 years, 1 month 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

« content/browser/renderer_host/media/media_stream_manager.cc ('K') | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/browser/renderer_host/media/media_stream_ui_proxy.cc » ('j') | content/public/common/media_stream_request.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a67237a1ed98e405329423ab2c2461214bf9ca8f..887d8b6138b7d5a83231747c913b39b07736edf1 100644

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

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

@@ -77,7 +77,6 @@ class MediaStreamManagerTest : public ::testing::Test {

}

virtual ~MediaStreamManagerTest() {

- media_stream_manager_->WillDestroyCurrentMessageLoop();

}

MOCK_METHOD1(Response, void(int index));

@@ -129,6 +128,8 @@ TEST_F(MediaStreamManagerTest, MakeAndCancelMediaAccessRequest) {

std::string label = MakeMediaAccessRequest(0);

// No callback is expected.

media_stream_manager_->CancelRequest(label);

+ run_loop_.RunUntilIdle();

+ media_stream_manager_->WillDestroyCurrentMessageLoop();

tommi (sloooow) - chröme 2013/11/26 14:44:21 is this necessary?

}

TEST_F(MediaStreamManagerTest, MakeMultipleRequests) {