Revert of MediaStream audio object graph untangling and clean-ups.

content/shell/renderer/layout_test/blink_test_runner.cc

Index: content/shell/renderer/layout_test/blink_test_runner.cc
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
index ad29dafd367fa5a41d003041932c71953667b114..13f30a302d973daf4c7a7e3b3b05c304fc53bff9 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -770,9 +770,7 @@
 #if defined(ENABLE_WEBRTC)
   return AddVideoTrackToMediaStream(
       make_scoped_ptr(new MockVideoCapturerSource()),
-      false,  // is_remote
-      false,  // is_readonly
-      stream);
+      false /* is_remote */, false /* is_readonly */, stream);
 #else
   return false;
 #endif
@@ -784,12 +782,7 @@
 #if defined(ENABLE_WEBRTC)
   return AddAudioTrackToMediaStream(
       make_scoped_refptr(new MockAudioCapturerSource()),
-      48000,  // sample rate
-      media::CHANNEL_LAYOUT_STEREO,
-      480,  // sample frames per buffer
-      false,  // is_remote
-      false,  // is_readonly
-      stream);
+      false /* is_remote */, false /* is_readonly */, stream);
 #else
   return false;
 #endif