Enable some webrtc content_browsertests on Android.

content/browser/media/webrtc_browsertest.cc

Index: content/browser/media/webrtc_browsertest.cc
diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc
index 47847a7d53bac2b7b1776d4602123880539f273f..add68e834469d8a7cc1c7c6f525f3ad080be0c8c 100644
--- a/content/browser/media/webrtc_browsertest.cc
+++ b/content/browser/media/webrtc_browsertest.cc
@@ -199,6 +199,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanSetupVideoCall) {
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
+  EXPECT_TRUE(ExecuteJavascript(
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
   EXPECT_TRUE(ExecuteJavascript("call({video: true});"));
   ExpectTitle("OK");
 }
@@ -246,6 +248,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) {
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
+  EXPECT_TRUE(ExecuteJavascript(
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
   EXPECT_TRUE(ExecuteJavascript("call({video: true, audio: true});"));
   ExpectTitle("OK");
 }
@@ -256,6 +260,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) {
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
+  EXPECT_TRUE(ExecuteJavascript(
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
   EXPECT_TRUE(
       ExecuteJavascript("callAndSendDtmf('123,abc');"));
 }
@@ -291,6 +297,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanForwardRemoteStream) {
   NavigateToURL(shell(), url);
 
   EXPECT_TRUE(ExecuteJavascript(
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
+  EXPECT_TRUE(ExecuteJavascript(
                   "callAndForwardRemoteStream({video: true, audio: true});"));
   ExpectTitle("OK");
 }
@@ -301,6 +309,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanForwardRemoteStream720p) {
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
+  EXPECT_TRUE(ExecuteJavascript(
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
   const std::string cmd = GenerateGetUserMediaCall("callAndForwardRemoteStream",
                                                    1280, 1280,
                                                    720, 720, 30, 30);
@@ -331,6 +341,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
+  EXPECT_TRUE(ExecuteJavascript(
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
   EXPECT_TRUE(ExecuteJavascript("callWithoutMsidAndBundle();"));
   ExpectTitle("OK");
 }
@@ -344,6 +356,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
+  EXPECT_TRUE(ExecuteJavascript(
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
   EXPECT_TRUE(ExecuteJavascript("negotiateUnsupportedVideoCodec();"));
   ExpectTitle("OK");
 }
@@ -356,6 +370,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, NegotiateNonCryptoCall) {
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
+  EXPECT_TRUE(ExecuteJavascript(
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
   EXPECT_TRUE(ExecuteJavascript("negotiateNonCryptoCall();"));
   ExpectTitle("OK");
 }
@@ -378,6 +394,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanSetupLegacyCall) {
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
+  EXPECT_TRUE(ExecuteJavascript(
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
   EXPECT_TRUE(ExecuteJavascript("callWithLegacySdp();"));
   ExpectTitle("OK");
 }
@@ -391,6 +409,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataOnly) {
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
+  EXPECT_TRUE(ExecuteJavascript(
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
   EXPECT_TRUE(ExecuteJavascript("callWithDataOnly();"));
   ExpectTitle("OK");
 }
@@ -401,6 +421,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithSctpDataOnly) {
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
+  EXPECT_TRUE(ExecuteJavascript(
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
   EXPECT_TRUE(ExecuteJavascript("callWithSctpDataOnly();"));
   ExpectTitle("OK");
 }
@@ -421,6 +443,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithDataAndMedia) {
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
+  EXPECT_TRUE(ExecuteJavascript(
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
   EXPECT_TRUE(ExecuteJavascript("callWithDataAndMedia();"));
   ExpectTitle("OK");
 }
@@ -440,6 +464,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
+  EXPECT_TRUE(ExecuteJavascript(
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
   EXPECT_TRUE(ExecuteJavascript("callWithSctpDataAndMedia();"));
   ExpectTitle("OK");
 }
@@ -480,6 +506,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithNewVideoMediaStream) {
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
+  EXPECT_TRUE(ExecuteJavascript(
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
   EXPECT_TRUE(ExecuteJavascript("callWithNewVideoMediaStream();"));
   ExpectTitle("OK");
 }
@@ -496,6 +524,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CallAndModifyStream) {
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
+  EXPECT_TRUE(ExecuteJavascript(
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
   EXPECT_TRUE(
       ExecuteJavascript("callWithNewVideoMediaStreamLaterSwitchToAudio();"));
   ExpectTitle("OK");
@@ -588,7 +618,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
   NavigateToURL(shell(), url);
 
   EXPECT_TRUE(ExecuteJavascript(
-      base::StringPrintf("callAndEnsureAudioIsPlaying(%s);", kForceIsac16K)));
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
+  EXPECT_TRUE(ExecuteJavascript("callAndEnsureAudioIsPlaying();"));
   ExpectTitle("OK");
 }
 
@@ -613,8 +644,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
   NavigateToURL(shell(), url);
 
   EXPECT_TRUE(ExecuteJavascript(
-        base::StringPrintf("callAndEnsureAudioMutingWorks(%s);",
-                           kForceIsac16K)));
+      base::StringPrintf("setForceIsac16K(%s);", kForceIsac16K)));
+  EXPECT_TRUE(ExecuteJavascript("callAndEnsureAudioMutingWorks();"));
   ExpectTitle("OK");
 }