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

Unified Diff: chromecast/media/cdm/cast_cdm_factory.cc

Issue 2586353002: [Chromecast][Clean-Up] Remove CastCdmProxy. (Closed)
Patch Set: Created 4 years 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 | « chromecast/media/cdm/BUILD.gn ('k') | chromecast/media/cdm/cast_cdm_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/media/cdm/cast_cdm_factory.cc
diff --git a/chromecast/media/cdm/cast_cdm_factory.cc b/chromecast/media/cdm/cast_cdm_factory.cc
index a0b1b5f86e544955fff29237f3fed924e0a3b4bf..2d0cca550f64a6ba2ae69ad5d1ce44c0fc972363 100644
--- a/chromecast/media/cdm/cast_cdm_factory.cc
+++ b/chromecast/media/cdm/cast_cdm_factory.cc
@@ -12,10 +12,6 @@
#include "media/base/cdm_config.h"
#include "media/base/cdm_key_information.h"
-#if !defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
-#include "chromecast/media/cdm/cast_cdm_proxy.h"
-#endif // !defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
-
namespace chromecast {
namespace media {
@@ -66,14 +62,7 @@ void CastCdmFactory::Create(
::media::BindToCurrentLoop(session_closed_cb),
::media::BindToCurrentLoop(session_keys_change_cb),
::media::BindToCurrentLoop(session_expiration_update_cb)));
-
-// When using Mojo media, we do not need to proxy calls to the CMA thread. All
-// calls are made on that thread already.
-#if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
bound_cdm_created_cb.Run(cast_cdm, "");
-#else
- bound_cdm_created_cb.Run(new CastCdmProxy(cast_cdm, task_runner_), "");
-#endif // defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
}
scoped_refptr<CastCdm> CastCdmFactory::CreatePlatformBrowserCdm(
« no previous file with comments | « chromecast/media/cdm/BUILD.gn ('k') | chromecast/media/cdm/cast_cdm_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698