3 files changed, 13 insertions, 19 deletions
diff --git a/content/renderer/media/audio_message_filter.h b/content/renderer/media/audio_message_filter.h
index c4428aa..f082a78 100644
--- a/content/renderer/media/audio_message_filter.h
+++ b/content/renderer/media/audio_message_filter.h
@@ -44,11 +44,6 @@ class CONTENT_EXPORT AudioMessageFilter : public IPC::MessageFilter {
   scoped_ptr<media::AudioOutputIPC> CreateAudioOutputIPC(int render_view_id,
                                                          int render_frame_id);
 
-  // When set, AudioMessageFilter will update the AudioHardwareConfig with new
-  // configuration values as received by OnOutputDeviceChanged().  The provided
-  // |config| must outlive AudioMessageFilter.
-  void SetAudioHardwareConfig(media::AudioHardwareConfig* config);
-
   // IO message loop associated with this message filter.
   scoped_refptr<base::MessageLoopProxy> io_message_loop() const {
     return io_message_loop_;
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 6e3672a..6259439 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1335,7 +1335,17 @@ AudioRendererMixerManager* RenderThreadImpl::GetAudioRendererMixerManager() {
 }
 
 media::AudioHardwareConfig* RenderThreadImpl::GetAudioHardwareConfig() {
-  return &audio_hardware_config_;
+  if (!audio_hardware_config_) {
+    media::AudioParameters input_params;
+    media::AudioParameters output_params;
+    Send(new ViewHostMsg_GetAudioHardwareConfig(
+        &input_params, &output_params));
+
+    audio_hardware_config_.reset(new media::AudioHardwareConfig(
+        input_params, output_params));
+  }
+
+  return audio_hardware_config_.get();
 }
 
 base::WaitableEvent* RenderThreadImpl::GetShutdownEvent() {
@@ -1518,8 +1528,6 @@ bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) {
     // is there a new non-windows message I should add here?
     IPC_MESSAGE_HANDLER(ViewMsg_New, OnCreateNewView)
     IPC_MESSAGE_HANDLER(ViewMsg_NetworkTypeChanged, OnNetworkTypeChanged)
-    IPC_MESSAGE_HANDLER(ViewMsg_SetAudioHardwareConfig,
-                        OnSetAudioHardwareConfig)
     IPC_MESSAGE_HANDLER(ViewMsg_TempCrashWithData, OnTempCrashWithData)
     IPC_MESSAGE_HANDLER(WorkerProcessMsg_CreateWorker, OnCreateNewSharedWorker)
     IPC_MESSAGE_HANDLER(ViewMsg_TimezoneChange, OnUpdateTimezone)
@@ -1682,13 +1690,6 @@ void RenderThreadImpl::OnNetworkTypeChanged(
       NetConnectionTypeToWebConnectionType(type));
 }
 
-void RenderThreadImpl::OnSetAudioHardwareConfig(
-    const media::AudioParameters& input,
-    const media::AudioParameters& output) {
-  audio_hardware_config_.UpdateInputConfig(input);
-  audio_hardware_config_.UpdateOutputConfig(output);
-}
-
 void RenderThreadImpl::OnTempCrashWithData(const GURL& data) {
   GetContentClient()->SetActiveURL(data);
   CHECK(false);
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index c4a05a2..0a77b36 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -25,7 +25,6 @@
 #include "content/common/gpu/gpu_result_codes.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/gpu/compositor_dependencies.h"
-#include "media/base/audio_hardware_config.h"
 #include "net/base/network_change_notifier.h"
 #include "third_party/WebKit/public/platform/WebConnectionType.h"
 #include "ui/gfx/native_widget_types.h"
@@ -67,6 +66,7 @@ class MessageFilter;
 }
 
 namespace media {
+class AudioHardwareConfig;
 class GpuVideoAcceleratorFactories;
 }
 
@@ -453,8 +453,6 @@ class CONTENT_EXPORT RenderThreadImpl
 #endif
   void OnNetworkTypeChanged(net::NetworkChangeNotifier::ConnectionType type);
   void OnGetAccessibilityTree();
-  void OnSetAudioHardwareConfig(const media::AudioParameters& input,
-                                const media::AudioParameters& output);
   void OnTempCrashWithData(const GURL& data);
   void OnUpdateTimezone();
   void OnMemoryPressure(
@@ -584,7 +582,7 @@ class CONTENT_EXPORT RenderThreadImpl
   scoped_refptr<ContextProviderCommandBuffer> gpu_va_context_provider_;
 
   scoped_ptr<AudioRendererMixerManager> audio_renderer_mixer_manager_;
-  media::AudioHardwareConfig audio_hardware_config_;
+  scoped_ptr<media::AudioHardwareConfig> audio_hardware_config_;
 
   HistogramCustomizer histogram_customizer_;