Revert of Disabling WebRtcBrowserTest.CallWithDataAndMedia

Revert of Disabling WebRtcBrowserTest.CallWithDataAndMedia (patchset #1 id:1 of https://codereview.chromium.org/290633003/)

Reason for revert:
Speculative re-enable.

Original issue's description:
> Disabling WebRtcBrowserTest.CallWithDataAndMedia
> 
> WebRtcBrowserTest.CallWithDataAndMedia is flaking on Android Tests (dbg).
> 
> BUG=374034
> TBR=perkj
> NOTRY=true
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=270888

TBR=perkj@chromium.org,trchen@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=374034

[phoglund_chromium, 2014-09-30 15:01:36]

Created Revert of Disabling WebRtcBrowserTest.CallWithDataAndMedia

[commit-bot: I haz the power, 2014-09-30 15:02:39]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/617883002/1

[commit-bot: I haz the power, 2014-09-30 15:03:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-09-30 15:03:12]

Failed to apply patch for content/browser/media/webrtc_browsertest.cc:
While running git apply --index -3 -p1;
  error: patch failed: content/browser/media/webrtc_browsertest.cc:247
  Falling back to three-way merge...
  Applied patch to 'content/browser/media/webrtc_browsertest.cc' with conflicts.
  U content/browser/media/webrtc_browsertest.cc

Patch:       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
f6aefa6e6aa2799c8f1621817615a6e91d2fcb7a..7377b0401f4e7ecbbc596c963fa99d0984cad828
100644
--- a/content/browser/media/webrtc_browsertest.cc
+++ b/content/browser/media/webrtc_browsertest.cc
@@ -247,7 +247,7 @@
 // This test will make a PeerConnection-based call and test an unreliable text
 // dataChannel and audio and video tracks.
 // TODO(mallinath) - Remove this test after rtp based data channel is disabled.
-IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, DISABLED_CallWithDataAndMedia) {
+IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MAYBE_CallWithDataAndMedia) {
   MakeTypicalPeerConnectionCall("callWithDataAndMedia();");
 }

[phoglund_chromium, 2014-09-30 15:20:49]

On 2014/09/30 15:03:12, I haz the power (commit-bot) wrote:
> Failed to apply patch for content/browser/media/webrtc_browsertest.cc:
> While running git apply --index -3 -p1;
>   error: patch failed: content/browser/media/webrtc_browsertest.cc:247
>   Falling back to three-way merge...
>   Applied patch to 'content/browser/media/webrtc_browsertest.cc' with
conflicts.
>   U content/browser/media/webrtc_browsertest.cc
> 
> Patch:       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
>
f6aefa6e6aa2799c8f1621817615a6e91d2fcb7a..7377b0401f4e7ecbbc596c963fa99d0984cad828
> 100644
> --- a/content/browser/media/webrtc_browsertest.cc
> +++ b/content/browser/media/webrtc_browsertest.cc
> @@ -247,7 +247,7 @@
>  // This test will make a PeerConnection-based call and test an unreliable
text
>  // dataChannel and audio and video tracks.
>  // TODO(mallinath) - Remove this test after rtp based data channel is
disabled.
> -IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, DISABLED_CallWithDataAndMedia) {
> +IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MAYBE_CallWithDataAndMedia) {
>    MakeTypicalPeerConnectionCall("callWithDataAndMedia();");
>  }

Alright, made https://codereview.chromium.org/612413003/ instead.