media: Enable Unified Media Pipeline for MSE and EME on Android

media/base/media.h

Index: media/base/media.h
diff --git a/media/base/media.h b/media/base/media.h
index b6cccc49f478dd6c6aabe3b4e2eedcd5fe444992..4cdb43e9c7ebe0acfd87ad6481271da11fd32be0 100644
--- a/media/base/media.h
+++ b/media/base/media.h
@@ -21,6 +21,15 @@ namespace media {
 // features.
 MEDIA_EXPORT void InitializeMediaLibrary();
 
+// Returns whether mojo CDM should be selected at runtime. Note that even when
+// mojo CDM is enabled at compile time, there are cases where we want to choose
+// other CDM types. For example, on Android when we use WebMediaPlayerAndroid,
+// we still want to use ProxyMediaKeys. In the future, when we experiment mojo
+// CDM on desktop, we will choose between mojo CDM and pepper CDM at runtime.
+// TODO(xhwang): Remove this when we use mojo CDM for all remote CDM cases by
+// default.
+MEDIA_EXPORT bool IsMojoCdmEnabled();
+
 #if defined(OS_ANDROID)
 // Tells the media library it has support for OS level decoders. Should only be
 // used for actual decoders (e.g. MediaCodec) and not full-featured players
@@ -41,12 +50,6 @@ MEDIA_EXPORT bool PlatformHasVp9Support();
 // unified media pipeline is supported everywhere.  http://crbug.com/580626.
 MEDIA_EXPORT bool IsUnifiedMediaPipelineEnabled();
 

[ddorwin, 2016/03/24 18:05:11]

Do we need a flag so we can selectively enable the new path for MSE separate
from .src=?

[xhwang, 2016/03/24 21:26:04]

OOC, why do you want this?

-// Similar to IsUnifiedMediaPipelineEnabled() but will also return true if
-// MediaCodec is not available (allowing the unified pipeline to take over for
-// cases where existing pipeline has no support). As above, codecs requiring
-// platform support may not be available.
-MEDIA_EXPORT bool IsUnifiedMediaPipelineEnabledForMse();
-
 // Returns whether the platform decoders are available for use.
 // This includes decoders being available on the platform and accessible, such
 // as via the GPU process. Should only be used for actual decoders