Merge "Fix -Wshorten-64-to-32 errors in test code"

libwvdrmengine/cdm/core/test/duration_use_case_test.cpp

@@ -207,7 +207,9 @@ class CdmDurationTest : public WvCdmTestBaseWithEngine,
   void SleepUntil(uint64_t desired_rental_time) {
     const uint64_t rental_time = CurrentRentalTime();
     if (desired_rental_time >= rental_time) {
-      TestSleep::Sleep(desired_rental_time - rental_time);
+      const unsigned int sleep_time =
+          static_cast<unsigned int>(desired_rental_time - rental_time);
+      TestSleep::Sleep(sleep_time);
     } else {
       LOGW("Test Clock skew sleeping from rental clock time %" PRIu64
            " to %" PRIu64,

libwvdrmengine/cdm/core/test/http_socket_test.cpp

@@ -73,7 +73,8 @@ class HttpSocketTest : public testing::Test {
 
     // append data
     request.append(data);
-    socket_->WriteAndLogErrors(request.c_str(), request.size(), kTimeout);
+    socket_->WriteAndLogErrors(request.c_str(),
+                               static_cast<int>(request.size()), kTimeout);
 
     LOGD("request: %s", request.c_str());
     return true;

libwvdrmengine/cdm/core/test/license_keys_unittest.cpp

@@ -201,8 +201,6 @@ class LicenseKeysTest : public ::testing::Test {
     EXPECT_EQ(key_usage.generic_verify, verify == kKeyFlagTrue);
   }
 
-  virtual int NumContentKeys() { return content_key_count_; }
-
   virtual void StageContentKeys() {
     content_key_count_ = 0;
     AddContentKey(ck_sw_crypto, true, KeyContainer::SW_SECURE_CRYPTO);

libwvdrmengine/cdm/core/test/test_base.cpp

@@ -809,11 +809,11 @@ std::string MakePSSH(const std::string& serialized_header) {
   size_t data_size = serialized_header.size();
   size_t atom_size = data_size + system_id_size + 4 * 4;
 
-  std::string pssh = EncodeUint32(atom_size);
+  std::string pssh = EncodeUint32(static_cast<uint32_t>(atom_size));
   pssh.append("pssh");
   pssh.append(EncodeUint32(version));
   pssh.append(system_id);
-  pssh.append(EncodeUint32(data_size));
+  pssh.append(EncodeUint32(static_cast<uint32_t>(data_size)));
   pssh.append(serialized_header);
   return pssh;
 }

libwvdrmengine/cdm/core/test/url_request.cpp

@@ -203,8 +203,8 @@ bool UrlRequest::PostRequestWithPath(const std::string& path,
 
   request.append(data);
 
-  const int ret = socket_.WriteAndLogErrors(request.c_str(), request.size(),
-                                            kWriteTimeoutMs);
+  const int ret = socket_.WriteAndLogErrors(
+      request.c_str(), static_cast<int>(request.size()), kWriteTimeoutMs);
   LOGV("HTTP request: (%zu): %s", request.size(), b2a_hex(request).c_str());
   return ret != -1;
 }