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

Unified Diff: content/browser/webrtc/webrtc_getusermedia_browsertest.cc

Issue 2922733002: Propagate muted state from MediaStreamAudioSource into JS. (Closed)
Patch Set: Made SetMuted call unconditional. Rebased. Created 3 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
« no previous file with comments | « no previous file | content/renderer/media/media_stream_audio_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/webrtc/webrtc_getusermedia_browsertest.cc
diff --git a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
index b1d00ebb8be8fe92e96de4a32d36f5f09b605e96..a43170e0cdb627ae3c4cf20a770c7ec1bcbba2cc 100644
--- a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
+++ b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
@@ -27,6 +27,7 @@
#include "content/public/test/test_utils.h"
#include "content/shell/browser/shell.h"
#include "media/audio/audio_manager.h"
+#include "media/audio/fake_audio_input_stream.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "testing/perf/perf_test.h"
@@ -46,6 +47,8 @@ static const char kGetUserMediaAndAnalyseAndStop[] =
"getUserMediaAndAnalyseAndStop";
static const char kGetUserMediaAndExpectFailure[] =
"getUserMediaAndExpectFailure";
+static const char kGetUserMediaForAudioMutingTest[] =
+ "getUserMediaForAudioMutingTest";
static const char kRenderSameTrackMediastreamAndStop[] =
"renderSameTrackMediastreamAndStop";
static const char kRenderClonedMediastreamAndStop[] =
@@ -1469,4 +1472,53 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaOldConstraintsBrowserTest,
MediaStreamManager::GenerateStreamTestCallback());
}
+IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
+ GetAudioStreamAndCheckMutingInitiallyUnmuted) {
+ ASSERT_TRUE(embedded_test_server()->Start());
+
+ GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
+ NavigateToURL(shell(), url);
+
+ // Expect stream to initially not be muted
+ media::FakeAudioInputStream::SetGlobalMutedState(false);
+ ExecuteJavascriptAndWaitForOk(
+ base::StringPrintf("%s(false);", kGetUserMediaForAudioMutingTest));
+
+ // Mute
+ media::FakeAudioInputStream::SetGlobalMutedState(true);
+ EXPECT_EQ("onmute: muted=true, readyState=live",
+ ExecuteJavascriptAndReturnResult(
+ "failTestAfterTimeout('Got no mute event', 1500);"));
+ // Unmute
+ media::FakeAudioInputStream::SetGlobalMutedState(false);
+ EXPECT_EQ("onunmute: muted=false, readyState=live",
+ ExecuteJavascriptAndReturnResult(
+ "failTestAfterTimeout('Got no unmute event', 1500);"));
+}
+
+IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
+ GetAudioStreamAndCheckMutingInitiallyMuted) {
+ ASSERT_TRUE(embedded_test_server()->Start());
+
+ GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
+ NavigateToURL(shell(), url);
+
+ // Expect stream to initially be muted
+ media::FakeAudioInputStream::SetGlobalMutedState(true);
+ ExecuteJavascriptAndWaitForOk(
+ base::StringPrintf("%s(true);", kGetUserMediaForAudioMutingTest));
+
+ // Unmute
+ media::FakeAudioInputStream::SetGlobalMutedState(false);
+ EXPECT_EQ("onunmute: muted=false, readyState=live",
+ ExecuteJavascriptAndReturnResult(
+ "failTestAfterTimeout('Got no unmute event', 1500);"));
+
+ // Mute
+ media::FakeAudioInputStream::SetGlobalMutedState(true);
+ EXPECT_EQ("onmute: muted=true, readyState=live",
+ ExecuteJavascriptAndReturnResult(
+ "failTestAfterTimeout('Got no mute event', 1500);"));
+}
+
} // namespace content
« no previous file with comments | « no previous file | content/renderer/media/media_stream_audio_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698