Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(541)

Unified Diff: media/renderers/audio_renderer_impl_unittest.cc

Issue 2085843002: Fix broken merge for M52 branch. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/renderers/audio_renderer_impl_unittest.cc
diff --git a/media/renderers/audio_renderer_impl_unittest.cc b/media/renderers/audio_renderer_impl_unittest.cc
index a1b475b4e748eb83c44fabe6e8d70099f23af7a8..74488a89b97650ea7d3577d1828319772ad9ad24 100644
--- a/media/renderers/audio_renderer_impl_unittest.cc
+++ b/media/renderers/audio_renderer_impl_unittest.cc
@@ -754,7 +754,8 @@ TEST_F(AudioRendererImplTest, RenderingDelayedForSuspend) {
// 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)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698