Bundle fake Widevine component manifest for stub CDM

chrome/chrome_dll_bundle.gypi

Index: chrome/chrome_dll_bundle.gypi
diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi
index 5b49c215afaa1659644dae695673cbc7356dd7df..22157aacff7d1abe798254e1dbe14503f9ccc3a0 100644
--- a/chrome/chrome_dll_bundle.gypi
+++ b/chrome/chrome_dll_bundle.gypi
@@ -136,11 +136,13 @@
     },
     {
       # The adapter is not a complete library on its own. It needs the Widevine
-      # CDM to work.
+      # CDM to work. The CDM and manifest are either the actual Widevine CDM
+      # and manifest or stubs used for testing only. The choice is made within
+      # the corresponding Widevine targets based on branding.
       'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries/<(widevine_cdm_path)',
       'files': [],
       'conditions': [
-        ['branding == "Chrome"', {
+        ['branding == "Chrome" or enable_widevine == 1', {
           'files': [
             '<(PRODUCT_DIR)/<(widevine_cdm_path)/libwidevinecdm.dylib',
             '<(PRODUCT_DIR)/<(widevine_cdm_path)/widevinecdmadapter.plugin',
@@ -152,7 +154,7 @@
       'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries/WidevineCdm',
       'files': [],
       'conditions': [
-        ['branding == "Chrome"', {
+        ['branding == "Chrome" or enable_widevine == 1', {
           'files': [
             '<(PRODUCT_DIR)/WidevineCdm/manifest.json',
           ],