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

Unified Diff: content/renderer/media/android/media_source_delegate.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
Index: content/renderer/media/android/media_source_delegate.cc
diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc
index 927057cafeb7fc0456af6dbd01e9e5cb88a73a8f..dde7e4e4bc303b4d4ada0266196debe574f4fd7e 100644
--- a/content/renderer/media/android/media_source_delegate.cc
+++ b/content/renderer/media/android/media_source_delegate.cc
@@ -8,11 +8,11 @@
#include <string>
#include <vector>
+#include "base/bind_to_current_loop.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/strings/string_number_conversions.h"
#include "content/renderer/media/android/renderer_demuxer_android.h"
#include "media/base/android/demuxer_stream_player_params.h"
-#include "media/base/bind_to_current_loop.h"
#include "media/base/demuxer_stream.h"
#include "media/base/media_log.h"
#include "media/blink/webmediaplayer_util.h"
@@ -153,17 +153,17 @@ void MediaSourceDelegate::InitializeMediaSource(
DCHECK(!media_source_opened_cb.is_null());
media_source_opened_cb_ = media_source_opened_cb;
encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
- set_decryptor_ready_cb_ = media::BindToCurrentLoop(set_decryptor_ready_cb);
- update_network_state_cb_ = media::BindToCurrentLoop(update_network_state_cb);
+ set_decryptor_ready_cb_ = base::BindToCurrentLoop(set_decryptor_ready_cb);
+ update_network_state_cb_ = base::BindToCurrentLoop(update_network_state_cb);
duration_change_cb_ = duration_change_cb;
waiting_for_decryption_key_cb_ =
- media::BindToCurrentLoop(waiting_for_decryption_key_cb);
+ base::BindToCurrentLoop(waiting_for_decryption_key_cb);
access_unit_size_ = kAccessUnitSizeForMediaSource;
chunk_demuxer_.reset(new media::ChunkDemuxer(
- media::BindToCurrentLoop(
+ base::BindToCurrentLoop(
base::Bind(&MediaSourceDelegate::OnDemuxerOpened, main_weak_this_)),
- media::BindToCurrentLoop(base::Bind(
+ base::BindToCurrentLoop(base::Bind(
&MediaSourceDelegate::OnEncryptedMediaInitData, main_weak_this_)),
base::Bind(&media::MediaLog::AddLogEvent, media_log_), media_log_,
false));

Powered by Google App Engine
This is Rietveld 408576698