Extract CdmManager from MojoCdmService.

media/BUILD.gn

Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 8d97ec513ba2e43f871c4a10b1db5d90b40fb9c7..a237cdc7a886b2b0db43ad276810dfd8d48fcf0d 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -377,10 +377,10 @@ component("media") {
   }
 
   if (disable_ffmpeg_video_decoders) {
-      sources -= [
-        "filters/decrypting_video_decoder.cc",
-        "filters/decrypting_video_decoder.h",
-      ]
+    sources -= [
+      "filters/decrypting_video_decoder.cc",
+      "filters/decrypting_video_decoder.h",
+    ]
   }
 
   if (is_android) {
@@ -516,6 +516,19 @@ component("media") {
   }
 }
 
+# Must not be a source_set() because CdmManager exposes a static singleton,
+# shared by multiple component()s.
+static_library("cdm_manager") {

[xhwang, 2017/05/04 01:41:41]

In a component build this will still cause multiple copies of the |manager|.
You'll want a component("cdm_manager") here. You can check this by looking at
the symbols in libmedia.so and libcontent.so, or something like that, or by
always print the address of |manager| when it's accessed.

[sandersd (OOO until July 31), 2017/05/04 19:56:11]

Done.

+  sources = [
+    "cdm/cdm_manager.cc",
+    "cdm/cdm_manager.h",
+  ]
+  deps = [
+    ":media",
+    "//base",
+  ]
+}
+
 static_library("cdm_paths") {
   sources = [
     "cdm/cdm_paths.cc",
@@ -659,9 +672,7 @@ source_set("unit_tests") {
     ]
 
     if (!disable_ffmpeg_video_decoders) {
-      sources += [
-        "filters/ffmpeg_video_decoder_unittest.cc",
-      ]
+      sources += [ "filters/ffmpeg_video_decoder_unittest.cc" ]
     }
   }