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

Unified Diff: chromecast/browser/media/cast_browser_cdm_factory.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 | « chrome/renderer/media/cast_session.cc ('k') | chromecast/browser/media/cma_message_filter_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/browser/media/cast_browser_cdm_factory.cc
diff --git a/chromecast/browser/media/cast_browser_cdm_factory.cc b/chromecast/browser/media/cast_browser_cdm_factory.cc
index 10bcfd3247a8d42fe204539d2fd80e166f6c79cc..03f08453b028a4d12c43d2200cce43508f4ecdb9 100644
--- a/chromecast/browser/media/cast_browser_cdm_factory.cc
+++ b/chromecast/browser/media/cast_browser_cdm_factory.cc
@@ -5,11 +5,11 @@
#include "chromecast/browser/media/cast_browser_cdm_factory.h"
#include "base/bind.h"
+#include "base/bind_to_current_loop.h"
#include "base/location.h"
#include "base/message_loop/message_loop_proxy.h"
#include "chromecast/browser/media/cma_message_loop.h"
#include "chromecast/media/cdm/browser_cdm_cast.h"
-#include "media/base/bind_to_current_loop.h"
#include "media/base/cdm_key_information.h"
namespace chromecast {
@@ -39,11 +39,11 @@ scoped_ptr<::media::BrowserCdm> CastBrowserCdmFactory::CreateBrowserCdm(
FROM_HERE,
base::Bind(&BrowserCdmCast::Initialize,
base::Unretained(browser_cdm.get()),
- ::media::BindToCurrentLoop(session_message_cb),
- ::media::BindToCurrentLoop(session_closed_cb),
- ::media::BindToCurrentLoop(legacy_session_error_cb),
- ::media::BindToCurrentLoop(session_keys_change_cb),
- ::media::BindToCurrentLoop(session_expiration_update_cb)));
+ base::BindToCurrentLoop(session_message_cb),
+ base::BindToCurrentLoop(session_closed_cb),
+ base::BindToCurrentLoop(legacy_session_error_cb),
+ base::BindToCurrentLoop(session_keys_change_cb),
+ base::BindToCurrentLoop(session_expiration_update_cb)));
return make_scoped_ptr(
new BrowserCdmCastUi(browser_cdm.Pass(),
CmaMessageLoop::GetMessageLoopProxy()));
« no previous file with comments | « chrome/renderer/media/cast_session.cc ('k') | chromecast/browser/media/cma_message_filter_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698