Re-implement work done originally done with:

- #507
- #510

This code was backed out with #513 (so we can do 0.55.x and 0.56.x builds in the meantime).

patches/media-media_options.gni.patch

@@ -0,0 +1,13 @@
+diff --git a/media/media_options.gni b/media/media_options.gni
+index d8e20f62c19d34d036760883a02d3350aa696f1b..b50672e5e84652d896561af669cc712458cd2912 100644
+--- a/media/media_options.gni
++++ b/media/media_options.gni
+@@ -146,7 +146,7 @@ declare_args() {
+   # Enables host verification for CDMs.
+   # Windows and Mac.
+   enable_cdm_host_verification =
+-      enable_library_cdms && (is_mac || is_win) && is_chrome_branded
++      enable_library_cdms && (is_mac || is_win) && is_official_build
+
+   # Enable Storage ID which is used by CDMs. This is only available with chrome
+   # branding, but may be overridden by other embedders.

patches/third_party-widevine-cdm-widevine.gni.patch

@@ -0,0 +1,13 @@
+diff --git a/third_party/widevine/cdm/widevine.gni b/third_party/widevine/cdm/widevine.gni
+index 82a93622585a424f56c3567050f9ba4822de6c1e..9c89d9a0c0a8b2df4e082cfd1ef9ace6ed8fc929 100644
+--- a/third_party/widevine/cdm/widevine.gni
++++ b/third_party/widevine/cdm/widevine.gni
+@@ -11,7 +11,7 @@ declare_args() {
+ }
+
+ enable_widevine_cdm_host_verification =
+-    (is_chrome_branded || enable_widevine) && enable_cdm_host_verification
++    enable_widevine && enable_cdm_host_verification
+
+ # Only bundle Widevine CDM in Google Chrome builds.
+ should_bundle_widevine_cdm = is_chrome_branded && enable_library_cdms