Add CdmService to keep track of CDMs

content/browser/browser_main_loop.cc

Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 9b29b001e512ae50c1501f149c5832bc3e37f12a..4877b4a91a5e0622aeafd94f92143ad0334ca4fd 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -171,6 +171,10 @@
 #include "content/browser/plugin_service_impl.h"
 #endif
 
+#if defined(ENABLE_MOJO_MEDIA)

[xhwang, 2016/04/13 00:22:12]

#if defined(ENABLE_MOJO_CDM) && defined(ENABLE_PEPPER_CDMS)

[jrummell, 2016/04/14 01:32:16]

Done.

+#include "content/browser/media/cdm_service_impl.h"
+#endif
+
 #if defined(USE_X11)
 #include "ui/base/x/x11_util_internal.h"
 #include "ui/gfx/x/x11_connection.h"
@@ -743,6 +747,12 @@ int BrowserMainLoop::PreCreateThreads() {
   }
 #endif
 
+#if defined(ENABLE_MOJO_MEDIA)

[xhwang, 2016/04/13 00:22:12]

ditto

[jrummell, 2016/04/14 01:32:16]

Done.

+  // Prior to any processing happening on the IO thread, we create the
+  // CDM service as it is predominantly used from the IO thread.

[xhwang, 2016/04/13 00:22:12]

Also mention that this must be called on the main thread since it involves file
path check.

[jrummell, 2016/04/14 01:32:16]

Done.

+  CdmService::GetInstance()->Init();
+#endif
+
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   // The WindowResizeHelper allows the UI thread to wait on specific renderer
   // and GPU messages from the IO thread. Initializing it before the IO thread