Revert of MediaStream audio: Refactor 3 separate "glue" implementations into one.

content/renderer/media/webrtc_audio_renderer_unittest.cc

 // Copyright 2014 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 "content/renderer/media/webrtc_audio_renderer.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "content/public/renderer/media_stream_audio_renderer.h"
 #include "content/renderer/media/audio_device_factory.h"
 #include "content/renderer/media/webrtc_audio_device_impl.h"
-#include "media/base/audio_capturer_source.h"
 #include "media/base/mock_audio_renderer_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebMediaStream.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
-#include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebHeap.h"
 #include "third_party/webrtc/api/mediastreaminterface.h"
 
 using testing::Return;
 using testing::_;
 
 namespace content {
 
 namespace {
 
@@ skipping 25 matching lines @@
                             media::OutputDeviceStatus result) {
     MockSwitchDeviceCallback(result);
     loop->Quit();
   }
 
  protected:
   WebRtcAudioRendererTest()
       : message_loop_(new base::MessageLoopForIO),
         source_(new MockAudioRendererSource()) {
     blink::WebVector<blink::WebMediaStreamTrack> dummy_tracks;
-    stream_.initialize(blink::WebString::fromUTF8("new stream"), dummy_tracks,
-                       dummy_tracks);
+    stream_.initialize("new stream", dummy_tracks, dummy_tracks);
   }
 
   void SetupRenderer(const std::string& device_id) {
     renderer_ = new WebRtcAudioRenderer(message_loop_->task_runner(), stream_,
                                         1, 1, device_id, url::Origin());
     EXPECT_CALL(
         *this, MockCreateAudioRendererSink(AudioDeviceFactory::kSourceWebRtc, _,
                                            _, device_id, _));
     EXPECT_TRUE(renderer_->Initialize(source_.get()));
 
@@ skipping 191 matching lines @@
   loop.Run();
   EXPECT_EQ(kDefaultOutputDeviceId,
             mock_sink_->GetOutputDeviceInfo().device_id());
 
   EXPECT_CALL(*mock_sink_.get(), Stop());
   EXPECT_CALL(*source_.get(), RemoveAudioRenderer(renderer_.get()));
   renderer_proxy_->Stop();
 }
 
 }  // namespace content