Media Recorder: Enable content browser test on Android.

content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc

Index: content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc
diff --git a/content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc b/content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc
index 00f8454dee22bf4df467ec6abcd824eea2f7ecdb..0d1fcb66bdd5bd3c3509f9573316f08a38f1c57f 100644
--- a/content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc
+++ b/content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc
@@ -11,140 +11,135 @@
 #include "content/test/webrtc_content_browsertest_base.h"
 #include "media/base/media_switches.h"
 
-#if defined(OS_ANDROID)
-// TODO(cpaulin): when crbug.com/561068 is fixed, enable this test
-// on android platform.
-#define MAYBE_WebRtcMediaRecorderTest DISABLED_WebRtcMediaRecorderTest
-#else
-#define MAYBE_WebRtcMediaRecorderTest WebRtcMediaRecorderTest
-#endif
-
 namespace {
 
-static const char kBlinkFeaturesNeeded[] = "GetUserMedia";
-
 static const char kMediaRecorderHtmlFile[] = "/media/mediarecorder_test.html";
 
 }  // namespace
 
 namespace content {
+
 // This class tests the recording of a media stream.
-class MAYBE_WebRtcMediaRecorderTest : public WebRtcContentBrowserTest {
+class WebRtcMediaRecorderTest : public WebRtcContentBrowserTest {
  public:
-  MAYBE_WebRtcMediaRecorderTest() {}
-  ~MAYBE_WebRtcMediaRecorderTest() override {}
+  WebRtcMediaRecorderTest() {}
+  ~WebRtcMediaRecorderTest() override {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     WebRtcContentBrowserTest::SetUpCommandLine(command_line);
 
-    // Turn on the flags we need.
     AppendUseFakeUIForMediaStreamFlag();
 
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kUseFakeDeviceForMediaStream);
 
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-        switches::kEnableBlinkFeatures, kBlinkFeaturesNeeded);
+        switches::kEnableBlinkFeatures, "GetUserMedia");
   }
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(MAYBE_WebRtcMediaRecorderTest);
+  DISALLOW_COPY_AND_ASSIGN(WebRtcMediaRecorderTest);
 };
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, MediaRecorderStart) {
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderStart) {
   MakeTypicalCall("testStartAndRecorderState();", kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
-                       MediaRecorderStartAndStop) {
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderStartAndStop) {
   MakeTypicalCall("testStartStopAndRecorderState();", kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        MediaRecorderStartAndDataAvailable) {
   MakeTypicalCall("testStartAndDataAvailable();", kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        MediaRecorderStartWithTimeSlice) {
   MakeTypicalCall("testStartWithTimeSlice();", kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, MediaRecorderResume) {
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderResume) {
   MakeTypicalCall("testResumeAndRecorderState();", kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        MediaRecorderNoResumeWhenRecorderInactive) {
   MakeTypicalCall("testIllegalResumeThrowsDOMError();", kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        MediaRecorderResumeAndDataAvailable) {
   MakeTypicalCall("testResumeAndDataAvailable();", kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
-                       MediaRecorderPause) {
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderPause) {
   MakeTypicalCall("testPauseAndRecorderState();", kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
-                       MediaRecorderPauseStop) {
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderPauseStop) {
   MakeTypicalCall("testPauseStopAndRecorderState();", kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        MediaRecorderPausePreventsDataavailableFromBeingFired) {
   MakeTypicalCall("testPausePreventsDataavailableFromBeingFired();",
                   kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        MediaRecorderIllegalPauseThrowsDOMError) {
   MakeTypicalCall("testIllegalPauseThrowsDOMError();", kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        MediaRecorderTwoChannelAudioRecording) {
   MakeTypicalCall("testTwoChannelAudio();", kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        MediaRecorderIllegalStopThrowsDOMError) {
   MakeTypicalCall("testIllegalStopThrowsDOMError();", kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        MediaRecorderIllegalStartWhileRecordingThrowsDOMError) {
   MakeTypicalCall("testIllegalStartInRecordingStateThrowsDOMError();",
                   kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        MediaRecorderIllegalStartWhilePausedThrowsDOMError) {
   MakeTypicalCall("testIllegalStartInPausedStateThrowsDOMError();",
                   kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        MediaRecorderIllegalRequestDataThrowsDOMError) {
   MakeTypicalCall("testIllegalRequestDataThrowsDOMError();",
                   kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
-                       MediaRecorderPeerConnection) {
+#if defined(OS_ANDROID)
+// TODO(cpaulin): when http://crbug.com/585242 is fixed, enable peer connection
+// recording test on android platform.
+#define MAYBE_MediaRecorderPeerConnection DISABLED_MediaRecorderPeerConnection
+#else
+#define MAYBE_MediaRecorderPeerConnection MediaRecorderPeerConnection
+#endif
+
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
+                       MAYBE_MediaRecorderPeerConnection) {
   MakeTypicalCall("testRecordRemotePeerConnection();", kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        AddingTrackToMediaStreamFiresErrorEvent) {
   MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();",
                   kMediaRecorderHtmlFile);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
                        RemovingTrackFromMediaStreamFiresErrorEvent) {
   MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();",
                   kMediaRecorderHtmlFile);