--- media/audio/pulse/pulse_output.cc.old	2012-04-09 06:41:54.000000000 -0700
+++ media/audio/pulse/pulse_output.cc	2012-04-11 17:48:19.150150971 -0700
@@ -138,16 +138,16 @@
 
 PulseAudioOutputStream::PulseAudioOutputStream(const AudioParameters& params,
                                                AudioManagerPulse* manager)
-    : channel_layout_(params.channel_layout),
+    : channel_layout_(params.channel_layout()),
       channel_count_(ChannelLayoutToChannelCount(channel_layout_)),
-      sample_format_(BitsToPASampleFormat(params.bits_per_sample)),
-      sample_rate_(params.sample_rate),
-      bytes_per_frame_(params.channels * params.bits_per_sample / 8),
+      sample_format_(BitsToPASampleFormat(params.bits_per_sample())),
+      sample_rate_(params.sample_rate()),
+      bytes_per_frame_(params.channels() * params.bits_per_sample() / 8),
       manager_(manager),
       pa_context_(NULL),
       pa_mainloop_(NULL),
       playback_handle_(NULL),
-      packet_size_(params.GetPacketSize()),
+      packet_size_(params.GetBytesPerBuffer()),
       frames_per_packet_(packet_size_ / bytes_per_frame_),
       client_buffer_(NULL),
       volume_(1.0f),