diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 21:40:50 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 21:40:50 +0000 |
| commit | a0e7e86682f9804b06d59d9163f8118484e30c91 (patch) | |
| tree | 2d85734289e5b6dfdf54c24c5de5d8e3f8e0eb39 /media/audio/alsa | |
| parent | b2a34d53b43b5c81b36d9c40caeed8353bb3c433 (diff) | |
| download | chromium_src-a0e7e86682f9804b06d59d9163f8118484e30c91.zip chromium_src-a0e7e86682f9804b06d59d9163f8118484e30c91.tar.gz chromium_src-a0e7e86682f9804b06d59d9163f8118484e30c91.tar.bz2 | |
Replace MessageLoopProxy with SingleThreadTaskRunner for the rest of media/.
BUG=315922
R=dalecurtis@chromium.org
TBR=jam
Review URL: https://codereview.chromium.org/66183002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/alsa')
| -rw-r--r-- | media/audio/alsa/alsa_output.cc | 3 | ||||
| -rw-r--r-- | media/audio/alsa/alsa_output_unittest.cc | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/media/audio/alsa/alsa_output.cc b/media/audio/alsa/alsa_output.cc index eccf8ee..f28dfca 100644 --- a/media/audio/alsa/alsa_output.cc +++ b/media/audio/alsa/alsa_output.cc @@ -39,7 +39,6 @@ #include "base/bind.h" #include "base/debug/trace_event.h" #include "base/logging.h" -#include "base/message_loop/message_loop.h" #include "base/stl_util.h" #include "base/time/time.h" #include "media/audio/alsa/alsa_util.h" @@ -159,7 +158,7 @@ AlsaPcmOutputStream::AlsaPcmOutputStream(const std::string& device_name, volume_(1.0f), source_callback_(NULL), audio_bus_(AudioBus::Create(params)) { - DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); DCHECK_EQ(audio_bus_->frames() * bytes_per_frame_, packet_size_); // Sanity check input values. diff --git a/media/audio/alsa/alsa_output_unittest.cc b/media/audio/alsa/alsa_output_unittest.cc index 99ae8b0..da7924f 100644 --- a/media/audio/alsa/alsa_output_unittest.cc +++ b/media/audio/alsa/alsa_output_unittest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/message_loop/message_loop.h" #include "base/strings/stringprintf.h" #include "media/audio/alsa/alsa_output.h" #include "media/audio/alsa/alsa_wrapper.h" @@ -102,8 +101,8 @@ class MockAudioManagerAlsa : public AudioManagerAlsa { } // We don't mock this method since all tests will do the same thing - // and use the current message loop. - virtual scoped_refptr<base::MessageLoopProxy> GetMessageLoop() OVERRIDE { + // and use the current task runner. + virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() OVERRIDE { return base::MessageLoop::current()->message_loop_proxy(); } |