Remove MockMediaInternals and incestuous usage.

content/test/webrtc_audio_device_test.h

Index: content/test/webrtc_audio_device_test.h
diff --git a/content/test/webrtc_audio_device_test.h b/content/test/webrtc_audio_device_test.h
index b22d7d91a92d00d2aa7033ea52ab5c20485e9b5b..03d557818a7a517769423ade10399ea982dc92a1 100644
--- a/content/test/webrtc_audio_device_test.h
+++ b/content/test/webrtc_audio_device_test.h
@@ -11,6 +11,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "content/browser/media/media_internals.h"

[acolwell GONE FROM CHROMIUM, 2013/11/22 19:12:48]

nit: forward declare instead.

[DaleCurtis, 2013/11/22 20:33:33]

Done.

 #include "content/browser/renderer_host/media/mock_media_observer.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "ipc/ipc_listener.h"
@@ -155,19 +156,14 @@ class MAYBE_WebRTCAudioDeviceTest : public ::testing::Test,
   void WaitForAudioManagerCompletion();
   void WaitForMessageLoopCompletion(base::MessageLoopProxy* loop);
 
-  // Convenience getter for gmock.
-  MockMediaInternals& media_observer() const {
-    return *media_internals_.get();
-  }
-
   std::string GetTestDataPath(const base::FilePath::StringType& file_name);
 
   scoped_ptr<ReplaceContentClientRenderer> saved_content_renderer_;
   base::MessageLoopForUI message_loop_;
   ContentRendererClient content_renderer_client_;
   RenderThreadImpl* render_thread_;  // Owned by mock_process_.
+  MediaInternals* media_internals_;
   scoped_ptr<WebRTCMockRenderProcess> mock_process_;
-  scoped_ptr<MockMediaInternals> media_internals_;
   scoped_ptr<MediaStreamManager> media_stream_manager_;
   scoped_ptr<media::AudioManager> audio_manager_;
   scoped_ptr<AudioMirroringManager> mirroring_manager_;