Merge "Use new Base64 encode functions." into sc-dev

libwvdrmengine/cdm/test/request_license_test.cpp

@@ -8,6 +8,7 @@
 #include <chrono>
 #include <sstream>
 #include <thread>
+#include <utility>
 
 #include <android-base/properties.h>
 #include <gmock/gmock.h>
@@ -2613,9 +2614,9 @@ TEST_F(WvCdmRequestLicenseTest, ProvisioningRevocationTest) {
     signed_response.SerializeToString(&response);
 
     if (!wvcdm::Properties::provisioning_messages_are_binary()) {
-      std::vector<uint8_t> response_vec(response.begin(), response.end());
+      const std::string binary_response = std::move(response);
       response = "\"signedResponse\": \"";
-      response.append(wvcdm::Base64SafeEncode(response_vec));
+      response.append(wvcdm::Base64SafeEncode(binary_response));
       response.append("\"");
     }