Merge "Fix errors being hidden by Protobuf warning-disabling"

libwvdrmengine/cdm/core/test/http_socket_test.cpp

@@ -30,7 +30,7 @@ const int kTimeout = 3000;
 class HttpSocketTest : public testing::Test {
  public:
   HttpSocketTest() {}
-  ~HttpSocketTest() {}
+  ~HttpSocketTest() override {}
 
  protected:
   bool Connect(const std::string& server_url) {
@@ -164,7 +164,7 @@ ParseUrlTests parse_url_tests[] = {
         "8888",                      // port
         "/",                         // path
     },
-    {nullptr, nullptr, false, nullptr, 0, nullptr}  // list terminator
+    {}  // list terminator
 };
 
 TEST_F(HttpSocketTest, ParseUrlTest) {

libwvdrmengine/cdm/core/test/license_unittest.cpp

@@ -535,9 +535,12 @@ TEST_F(CdmLicenseTest, PrepareKeyRequestValidationV15) {
 }
 
 struct EntitledKeyVariant {
-  EntitledKeyVariant(const char* name, const std::string& key,
-                     bool should_succeed)
-      : name(name), key(key), should_succeed(should_succeed) {}
+  EntitledKeyVariant(const char* name_param, const std::string& key_param,
+                     bool should_succeed_param)
+      : name(name_param),
+        key(key_param),
+        should_succeed(should_succeed_param) {}
+
   const std::string name;
   const std::string key;
   const bool should_succeed;

libwvdrmengine/cdm/core/test/test_base.cpp

@@ -764,7 +764,7 @@ bool TestLicenseHolder::DeriveKey(const std::vector<uint8_t>& key,
     return false;
   }
 
-  if (!CMAC_Init(cmac_ctx, &key[0], key.size(), cipher, 0)) {
+  if (!CMAC_Init(cmac_ctx, &key[0], key.size(), cipher, nullptr)) {
     LOGE("DeriveKey(): CMAC_Init");
     CMAC_CTX_free(cmac_ctx);
     return false;