Fixing WebRTC AEC dump tests on Android, disabling DTMF test.

Seems the DTMF test didn't work well after all, when running with Opus.

The AEC tests were broken because they didn't force iSAC.

BUG=181069,332016

Review URL: https://codereview.chromium.org/128353002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243685 0039d316-1c4b-4281-b951-d872f2087c98

build/android/pylib/gtest/filter/content_browsertests_disabled

@@ -71,6 +71,7 @@ WebrtcBrowserTest.CanSetupLegacyCall
 WebrtcBrowserTest.CallWithDataOnly
 WebrtcBrowserTest.CallWithDataAndMedia
 WebrtcBrowserTest.CanMakeEmptyCallThenAddStreamsAndRenegotiate
+WebrtcBrowserTest.MANUAL_CanSetupCallAndSendDtmf
 WebRTCInternalsBrowserTest.WithRealPeerConnectionCall
 WebRTCInternalsBrowserTest.NegotiateUnsupportedVideoCodec
 WebRTCInternalsBrowserTest.NegotiateNonCryptoCall

content/browser/media/webrtc_aecdump_browsertest.cc

@@ -82,6 +82,11 @@ IN_PROC_BROWSER_TEST_F(WebrtcAecDumpBrowserTest, MAYBE_CallWithAecDump) {
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
+#if defined (OS_ANDROID)
+    // Always force iSAC 16K on Android for now (Opus is broken).
+    ASSERT_TRUE(ExecuteJavascript("forceIsac16KInSdp();"));
+#endif
+
   EXPECT_TRUE(ExecuteJavascript("call({video: true, audio: true});"));
   ExpectTitle("OK");
 

content/browser/media/webrtc_browsertest.cc

@@ -228,7 +228,10 @@ class WebrtcBrowserTest: public ContentBrowserTest {
 
     GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
     NavigateToURL(shell(), url);
+    ExecuteTestAndWaitForOk(javascript);
+  }
 
+  void ExecuteTestAndWaitForOk(const std::string& javascript) {
 #if defined (OS_ANDROID)
     // Always force iSAC 16K on Android for now (Opus is broken).
     ASSERT_TRUE(ExecuteJavascript("forceIsac16KInSdp();"));
@@ -752,9 +755,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithAecDump) {
 
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript("call({video: true, audio: true});"));
-  ExpectTitle("OK");
+  ExecuteTestAndWaitForOk("call({video: true, audio: true});");
 
   EXPECT_TRUE(base::PathExists(dump_file));
   int64 file_size = 0;
@@ -790,9 +791,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
 
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
-
-  EXPECT_TRUE(ExecuteJavascript("call({video: true, audio: true});"));
-  ExpectTitle("OK");
+  ExecuteTestAndWaitForOk("call({video: true, audio: true});");
 
   EXPECT_TRUE(base::PathExists(dump_file));
   int64 file_size = 0;