MediaRecorder: make MediaRecorderHandler a MediaStreamObserver

content/browser/media/webrtc_media_recorder_browsertest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"
@@ skipping 10 matching lines @@
 namespace {
 
 // Blink features necessary to run the test.
 static const char kBlinkFeaturesNeeded[] = "GetUserMedia,MediaRecorder";
 
 static const char kMediaRecorderHtmlFile[] = "/media/mediarecorder_test.html";
 
 }  // namespace
 
 namespace content {
-// This class tests the recording of a media stream.
+// This class tests the recording of a Media Stream.
 class MAYBE_WebRtcMediaRecorderTest : public WebRtcContentBrowserTest {
  public:
   MAYBE_WebRtcMediaRecorderTest() {}
   ~MAYBE_WebRtcMediaRecorderTest() override {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     WebRtcContentBrowserTest::SetUpCommandLine(command_line);
 
     // Turn on the flags we need.
     AppendUseFakeUIForMediaStreamFlag();
@@ skipping 28 matching lines @@
   MakeTypicalCall("testStartWithTimeSlice();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, MediaRecorderResume) {
   MakeTypicalCall("testResumeAndRecorderState();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
                        MediaRecorderNoResumeWhenRecorderInactive) {
   MakeTypicalCall("testNoResumeWhileRecorderInactive();",
-      kMediaRecorderHtmlFile);
+                  kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
                        MediaRecorderResumeAndDataAvailable) {
   MakeTypicalCall("testResumeAndDataAvailable();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
                        MediaRecorderPause) {
   MakeTypicalCall("testPauseAndRecorderState();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
                        MediaRecorderPauseStop) {
   MakeTypicalCall("testPauseStopAndRecorderState();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
                        MediaRecorderPausePreventsDataavailableFromBeingFired) {
   MakeTypicalCall("testPausePreventsDataavailableFromBeingFired();",
-      kMediaRecorderHtmlFile);
+                  kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
                        MediaRecorderIllegalPauseThrowsDOMError) {
   MakeTypicalCall("testIllegalPauseThrowsDOMError();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
                        MediaRecorderTwoChannelAudioRecording) {
   MakeTypicalCall("testTwoChannelAudio();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
                        MediaRecorderIllegalStopThrowsDOMError) {
-  MakeTypicalCall("testIllegalStopThrowsDOMError();",
-      kMediaRecorderHtmlFile);
+  MakeTypicalCall("testIllegalStopThrowsDOMError();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
                        MediaRecorderIllegalStartWhileRecordingThrowsDOMError) {
   MakeTypicalCall("testIllegalStartInRecordingStateThrowsDOMError();",
-      kMediaRecorderHtmlFile);
+                  kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
                        MediaRecorderIllegalStartWhilePausedThrowsDOMError) {
   MakeTypicalCall("testIllegalStartInPausedStateThrowsDOMError();",
-      kMediaRecorderHtmlFile);
+                  kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
                        MediaRecorderIllegalRequestDataThrowsDOMError) {
   MakeTypicalCall("testIllegalRequestDataThrowsDOMError();",
-    kMediaRecorderHtmlFile);
+                  kMediaRecorderHtmlFile);
+}
+
+IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
+                       AddingTrackToMediaStreamFiresErrorEvent) {
+  MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();",
+                  kMediaRecorderHtmlFile);
+}
+
+IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
+                       RemovingTrackFromMediaStreamFiresErrorEvent) {
+  MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();",
+                  kMediaRecorderHtmlFile);
 }
 
 }  // namespace content