Fix broken merge for M52 branch.

media/renderers/audio_renderer_impl_unittest.cc

 // 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.
 
 #include "media/renderers/audio_renderer_impl.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 736 matching lines @@
     ASSERT_NE(0.0f, bus->channel(0)[i]);
 }
 
 TEST_F(AudioRendererImplTest, RenderingDelayedForSuspend) {
   Initialize();
   Preroll(base::TimeDelta(), base::TimeDelta(), PIPELINE_OK);
   StartTicking();
 
   // Verify the first buffer is real data.
   int frames_read = 0;
-  std::unique_ptr<AudioBus> bus = AudioBus::Create(hardware_params_);
+  std::unique_ptr<AudioBus> bus =
+      AudioBus::Create(hardware_config_.GetOutputConfig());
   EXPECT_TRUE(sink_->Render(bus.get(), 0, &frames_read));
   EXPECT_NE(0, frames_read);
   for (int i = 0; i < bus->frames(); ++i)
     ASSERT_NE(0.0f, bus->channel(0)[i]);
 
   // Verify after suspend we get silence.
   renderer_->OnSuspend();
   EXPECT_TRUE(sink_->Render(bus.get(), 0, &frames_read));
   EXPECT_EQ(0, frames_read);
 
@@ skipping 210 matching lines @@
   // Advance far enough that we shouldn't be clamped to current time (tested
   // already above).
   tick_clock_->Advance(kOneSecond);
   EXPECT_EQ(
       current_time + timestamp_helper.GetFrameDuration(frames_to_consume.value),
       CurrentMediaWallClockTime(&is_time_moving));
   EXPECT_TRUE(is_time_moving);
 }
 
 }  // namespace media