Source release 16.4.1

cdm/cdm.gyp

@@ -115,13 +115,6 @@
           '../core/src/oemcrypto_adapter_static.cpp',
           ],
         }],
-        # TODO(b/139814713): For testing and internal use only.
-        ['oemcrypto_adapter_type=="static_v15"', {
-          'sources': [
-            '../core/src/oemcrypto_adapter_static.cpp',
-            '../core/src/oemcrypto_adapter_static_v16.cpp',
-          ],
-        }],
       ],
     },  # widevine_cdm_core target
     {

cdm/cdm_unittests.gyp

@@ -64,13 +64,6 @@
             'oec_ref',
           ],
         }],
-        # TODO(b/139814713): For testing and internal use only.
-        ['oemcrypto_adapter_type=="static_v15"', {
-          'defines': [
-            # This is used by the unit tests to use some v15 functions.
-            'TEST_OEMCRYPTO_V15',
-          ],
-        }],
         ['oemcrypto_lib=="level3"', {
           'sources': [
             # The test impl of OEMCrypto_Level3FileSystem and its factory.

cdm/include/cdm_version.h

@@ -1,5 +1,5 @@
 // Widevine CE CDM Version
 #ifndef CDM_VERSION
-# define CDM_VERSION "16.4.0"
+#  define CDM_VERSION "16.4.1"
 #endif
 #define EME_VERSION "https://www.w3.org/TR/2017/REC-encrypted-media-20170918"

cdm/test/cdm_test.cpp

@@ -335,12 +335,11 @@ class CdmTest : public WvCdmTestBase, public Cdm::IEventListener {
     }
   }
 
-  void FetchLicenseFailure(const std::string& message,
-                           int expected_status_code) {
+  void FetchLicenseFailure(const std::string& message) {
     int status_code;
     bool ok = Fetch(config_.license_server(), message, nullptr, &status_code);
     ASSERT_TRUE(ok);
-    if (ok) ASSERT_EQ(expected_status_code, status_code);
+    if (ok) ASSERT_THAT(status_code, AllOf(Ge(400), Le(599)));
   }
 
   void CreateSessionAndGenerateRequest(Cdm::SessionType session_type,
@@ -1901,7 +1900,7 @@ TEST_F(CdmTest, RequestPersistentLicenseWithWrongInitData) {
   Mock::VerifyAndClear(this);
 
   // The license server will reject this.
-  FetchLicenseFailure(message, 500);
+  FetchLicenseFailure(message);
 }
 
 // TODO(b/34949512): Fix this test so it can be re-enabled.