Extract CdmManager from MojoCdmService.

media/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/buildflag_header.gni")
 import("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/features.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//build/config/ui.gni")
@@ skipping 359 matching lines @@
 
   if (media_use_libvpx) {
     sources += [
       "filters/vpx_video_decoder.cc",
       "filters/vpx_video_decoder.h",
     ]
     deps += [ "//third_party/libvpx" ]
   }
 
   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) {
     sources -= [
       "filters/decrypting_audio_decoder.cc",
       "filters/decrypting_audio_decoder.h",
     ]
     sources += [
       "filters/android/media_codec_audio_decoder.cc",
       "filters/android/media_codec_audio_decoder.h",
@@ skipping 115 matching lines @@
 
   if (use_udev) {
     deps += [ "//device/udev_linux" ]
     sources += [
       "device_monitors/device_monitor_udev.cc",
       "device_monitors/device_monitor_udev.h",
     ]
   }
 }
 
+# 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",
     "cdm/cdm_paths.h",
   ]
   deps = [
     "//base",
   ]
 }
 
@@ skipping 123 matching lines @@
     ]
 
     deps += [
       "//media/ffmpeg:ffmpeg_unittests",
 
       # Direct dependency needed for the config
       "//third_party/opus",
     ]
 
     if (!disable_ffmpeg_video_decoders) {
-      sources += [
-        "filters/ffmpeg_video_decoder_unittest.cc",
-      ]
+      sources += [ "filters/ffmpeg_video_decoder_unittest.cc" ]
     }
   }
 
   if (current_cpu != "arm" && is_chromeos) {
     sources += [ "filters/h264_bitstream_buffer_unittest.cc" ]
   }
 
   if (proprietary_codecs) {
     sources += [
       "cdm/cenc_utils_unittest.cc",
@@ skipping 302 matching lines @@
   fuzzer_test("media_mp4_avcc_parser_fuzzer") {
     sources = [
       "formats/mp4/mp4_avcc_parser_fuzzer.cc",
     ]
     deps = [
       ":media",
       "//base",
     ]
   }
 }