Index: chrome/renderer/media/cast_session.cc |
diff --git a/chrome/renderer/media/cast_session.cc b/chrome/renderer/media/cast_session.cc |
index 0983a2b083946f3de9f8d6e011f01a531c012476..c4ab5fdb4d0343a7f1d1703ace51d9aed44c736c 100644 |
--- a/chrome/renderer/media/cast_session.cc |
+++ b/chrome/renderer/media/cast_session.cc |
@@ -4,11 +4,11 @@ |
#include "chrome/renderer/media/cast_session.h" |
+#include "base/bind_to_current_loop.h" |
#include "base/message_loop/message_loop_proxy.h" |
#include "chrome/renderer/media/cast_session_delegate.h" |
#include "content/public/renderer/render_thread.h" |
#include "content/public/renderer/video_encode_accelerator.h" |
-#include "media/base/bind_to_current_loop.h" |
#include "media/base/video_frame.h" |
#include "media/cast/cast_config.h" |
#include "media/cast/cast_sender.h" |
@@ -61,8 +61,8 @@ void CastSession::StartAudio(const media::cast::AudioSenderConfig& config, |
base::Bind(&CastSessionDelegate::StartAudio, |
base::Unretained(delegate_.get()), |
config, |
- media::BindToCurrentLoop(callback), |
- media::BindToCurrentLoop(error_callback))); |
+ base::BindToCurrentLoop(callback), |
+ base::BindToCurrentLoop(error_callback))); |
} |
void CastSession::StartVideo(const media::cast::VideoSenderConfig& config, |
@@ -76,11 +76,11 @@ void CastSession::StartVideo(const media::cast::VideoSenderConfig& config, |
base::Bind(&CastSessionDelegate::StartVideo, |
base::Unretained(delegate_.get()), |
config, |
- media::BindToCurrentLoop(callback), |
- media::BindToCurrentLoop(error_callback), |
- media::BindToCurrentLoop( |
+ base::BindToCurrentLoop(callback), |
+ base::BindToCurrentLoop(error_callback), |
+ base::BindToCurrentLoop( |
base::Bind(&CreateVideoEncodeAccelerator)), |
- media::BindToCurrentLoop( |
+ base::BindToCurrentLoop( |
base::Bind(&CreateVideoEncodeMemory)))); |
} |
@@ -95,7 +95,7 @@ void CastSession::StartUDP(const net::IPEndPoint& remote_endpoint, |
net::IPEndPoint(), |
remote_endpoint, |
base::Passed(&options), |
- media::BindToCurrentLoop(error_callback))); |
+ base::BindToCurrentLoop(error_callback))); |
} |
void CastSession::ToggleLogging(bool is_audio, bool enable) { |
@@ -116,7 +116,7 @@ void CastSession::GetEventLogsAndReset( |
base::Unretained(delegate_.get()), |
is_audio, |
extra_data, |
- media::BindToCurrentLoop(callback))); |
+ base::BindToCurrentLoop(callback))); |
} |
void CastSession::GetStatsAndReset(bool is_audio, |
@@ -126,5 +126,5 @@ void CastSession::GetStatsAndReset(bool is_audio, |
base::Bind(&CastSessionDelegate::GetStatsAndReset, |
base::Unretained(delegate_.get()), |
is_audio, |
- media::BindToCurrentLoop(callback))); |
+ base::BindToCurrentLoop(callback))); |
} |