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

Unified Diff: media/filters/chunk_demuxer.cc

Issue 1083883003: Move BindToCurrentLoop from media/base/ to base/ Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix media/base/callback_holder.h compile Created 5 years, 8 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 | « media/blink/webmediaplayer_impl.cc ('k') | media/filters/decoder_selector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index d641ded72c00e74a3fd48b9805c1e5f319cf9efa..e7d245375671aa828fb613f7a647022f7ced416b 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -9,12 +9,12 @@
#include <list>
#include "base/bind.h"
+#include "base/bind_to_current_loop.h"
#include "base/callback_helpers.h"
#include "base/location.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/stl_util.h"
#include "media/base/audio_decoder_config.h"
-#include "media/base/bind_to_current_loop.h"
#include "media/base/stream_parser_buffer.h"
#include "media/base/video_decoder_config.h"
#include "media/filters/frame_processor.h"
@@ -992,7 +992,7 @@ void ChunkDemuxerStream::Read(const ReadCB& read_cb) {
DCHECK_NE(state_, UNINITIALIZED);
DCHECK(read_cb_.is_null());
- read_cb_ = BindToCurrentLoop(read_cb);
+ read_cb_ = base::BindToCurrentLoop(read_cb);
CompletePendingReadIfPossible_Locked();
}
@@ -1133,7 +1133,7 @@ void ChunkDemuxer::Initialize(
base::AutoLock auto_lock(lock_);
// The |init_cb_| must only be run after this method returns, so always post.
- init_cb_ = BindToCurrentLoop(cb);
+ init_cb_ = base::BindToCurrentLoop(cb);
if (state_ == SHUTDOWN) {
base::ResetAndReturn(&init_cb_).Run(DEMUXER_ERROR_COULD_NOT_OPEN);
return;
@@ -1159,7 +1159,7 @@ void ChunkDemuxer::Seek(TimeDelta time, const PipelineStatusCB& cb) {
base::AutoLock auto_lock(lock_);
DCHECK(seek_cb_.is_null());
- seek_cb_ = BindToCurrentLoop(cb);
+ seek_cb_ = base::BindToCurrentLoop(cb);
if (state_ != INITIALIZED && state_ != ENDED) {
base::ResetAndReturn(&seek_cb_).Run(PIPELINE_ERROR_INVALID_STATE);
return;
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/filters/decoder_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698