MediaRecorder: wire the bitRate settings in Blink and content (2nd go)

content/renderer/media/media_recorder_handler_unittest.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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/child_process.h"
@@ skipping 163 matching lines @@
   const WebString example_unsupported_codecs_2(base::UTF8ToUTF16("vorbis"));
   EXPECT_FALSE(media_recorder_handler_->canSupportMimeType(
                    mime_type_audio, example_unsupported_codecs_2));
 }
 
 // Checks that the initialization-destruction sequence works fine.
 TEST_P(MediaRecorderHandlerTest, InitializeStartStop) {
   AddTracks();
   const WebString mime_type(base::UTF8ToUTF16(GetParam().mime_type));
   const WebString codecs(base::UTF8ToUTF16(GetParam().codecs));
-  EXPECT_TRUE(media_recorder_handler_->initialize(this,
-                                                  registry_.test_stream(),
-                                                  mime_type,
-                                                  codecs));
+  EXPECT_TRUE(media_recorder_handler_->initialize(this, registry_.test_stream(),
+                                                  mime_type, codecs, 0, 0));
   EXPECT_FALSE(recording());
   EXPECT_FALSE(hasVideoRecorders());
   EXPECT_FALSE(hasAudioRecorders());
 
   EXPECT_TRUE(media_recorder_handler_->start());
   EXPECT_TRUE(recording());
 
   EXPECT_TRUE(hasVideoRecorders() || !GetParam().has_video);
   EXPECT_TRUE(hasAudioRecorders() || !GetParam().has_audio);
 
@@ skipping 11 matching lines @@
 TEST_P(MediaRecorderHandlerTest, EncodeVideoFrames) {
   // Video-only test.
   if (GetParam().has_audio)
     return;
 
   AddTracks();
 
   const WebString mime_type(base::UTF8ToUTF16(GetParam().mime_type));
   const WebString codecs(base::UTF8ToUTF16(GetParam().codecs));
   EXPECT_TRUE(media_recorder_handler_->initialize(this, registry_.test_stream(),
-                                                  mime_type, codecs));
+                                                  mime_type, codecs, 0, 0));
   EXPECT_TRUE(media_recorder_handler_->start());
 
   InSequence s;
   const scoped_refptr<media::VideoFrame> video_frame =
       media::VideoFrame::CreateBlackFrame(gfx::Size(160, 80));
 
   {
     base::RunLoop run_loop;
     base::Closure quit_closure = run_loop.QuitClosure();
     // writeData() is pinged a number of times as the WebM header is written;
@@ skipping 38 matching lines @@
 
 // Sends 2 frames and expect them as WebM contained encoded data in writeData().
 TEST_P(MediaRecorderHandlerTest, EncodeAudioFrames) {
   // Audio-only test.
   if (GetParam().has_video)
     return;
 
   AddTracks();
 
   const WebString mime_type(base::UTF8ToUTF16("audio/webm"));
-  EXPECT_TRUE(media_recorder_handler_->initialize(this, registry_.test_stream(),
-                                                  mime_type, WebString()));
+  EXPECT_TRUE(media_recorder_handler_->initialize(
+      this, registry_.test_stream(), mime_type, WebString(), 0, 0));
   EXPECT_TRUE(media_recorder_handler_->start());
 
   InSequence s;
   const scoped_ptr<media::AudioBus> audio_bus1 = NextAudioBus();
   const scoped_ptr<media::AudioBus> audio_bus2 = NextAudioBus();
 
   media::AudioParameters params(
       media::AudioParameters::AUDIO_PCM_LINEAR, media::CHANNEL_LAYOUT_STEREO,
       kTestAudioSampleRate, kTestAudioBitsPerSample,
       kTestAudioSampleRate * kTestAudioBufferDurationMS / 1000);
@@ skipping 32 matching lines @@
   }
 
   media_recorder_handler_->stop();
 
   // Expect a last call on destruction, with size 0 and |lastInSlice| true.
   EXPECT_CALL(*this, writeData(nullptr, 0, true)).Times(1);
   media_recorder_handler_.reset();
 }
 
 }  // namespace content