Remove MockMediaInternals and incestuous usage.

content/test/webrtc_audio_device_test.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_TEST_WEBRTC_AUDIO_DEVICE_TEST_H_
 #define CONTENT_TEST_WEBRTC_AUDIO_DEVICE_TEST_H_
 
 #include <string>
 
 #include "base/files/file_path.h"
 #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"
 #include "media/base/audio_hardware_config.h"
 #include "media/base/channel_layout.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/webrtc/common_types.h"
 
 namespace IPC {
 class Channel;
@@ skipping 124 matching lines @@
                                 media::AudioParameters* output_params);
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Posts a final task to the IO message loop and waits for completion.
   void WaitForIOThreadCompletion();
   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_;
   scoped_ptr<net::URLRequestContext> test_request_context_;
   scoped_ptr<ResourceContext> resource_context_;
   scoped_ptr<IPC::Channel> channel_;
   scoped_refptr<TestAudioRendererHost> audio_render_host_;
   scoped_refptr<TestAudioInputRendererHost> audio_input_renderer_host_;
 
   media::AudioHardwareConfig* audio_hardware_config_;  // Weak reference.
@@ skipping 28 matching lines @@
   virtual int SendPacket(int channel, const void* data, int len) OVERRIDE;
   virtual int SendRTCPPacket(int channel, const void* data, int len) OVERRIDE;
 
  private:
   webrtc::VoENetwork* network_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_WEBRTC_AUDIO_DEVICE_TEST_H_