Fixed DTMF test on Android.

Turns out we accidently removed the DTMF payload type from the SDP. We
now preserve it even if we force iSAC.

BUG=332016
R=wjia@chromium.org

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

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

build/android/pylib/gtest/filter/content_browsertests_disabled

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

content/browser/media/webrtc_browsertest.cc

@@ -450,14 +450,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) {
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) {
-  // Don't force iSAC on Android for this test: iSAC doesn't work with DTMF.
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
-  NavigateToURL(shell(), url);
-
-  ASSERT_TRUE(ExecuteJavascript("callAndSendDtmf(\'123,abc\');"));
-  ExpectTitle("OK");
+  MakeTypicalPeerConnectionCall("callAndSendDtmf(\'123,abc\');");
 }
 
 // TODO(phoglund): this test fails because the peer connection state will be

content/test/data/media/peerconnection-call.html

@@ -27,12 +27,14 @@
   var maybeForceIsac16K = function(sdp) { return sdp; };
   function forceIsac16KInSdp() {
     maybeForceIsac16K = function(sdp) {
-      // Remove all other codecs (not the video codecs though).
+      // Remove all other codecs (not the video codecs though). Also leave
+      // 126 for DTMF.
       sdp = sdp.replace(/m=audio (\d+) RTP\/SAVPF.*\r\n/g,
-                        'm=audio $1 RTP/SAVPF 103\r\n');
+                        'm=audio $1 RTP/SAVPF 103 126\r\n');
       sdp = sdp.replace('a=fmtp:111 minptime=10', 'a=fmtp:103 minptime=10');
-      sdp = sdp.replace(/a=rtpmap:(?!103)\d{1,3} (?!X?VP8|red|ulpfec).*\r\n/g,
-                        '');
+      sdp = sdp.replace(
+          /a=rtpmap:(?!(103|126))\d{1,3} (?!X?VP8|red|ulpfec).*\r\n/g,
+          '');
       return sdp;
     };
   }