Source release 17.1.0

core/test/parallel_operations_test.cpp

@@ -1,11 +1,14 @@
 // Copyright 2019 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.
 
 // These tests perform various end-to-end actions similar to what an application
 // would, but in parallel, attempting to create as many collisions in the CDM
 // code as possible.
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <chrono>
 #include <future>
 #include <map>
@@ -13,9 +16,6 @@
 #include <thread>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "cdm_engine.h"
 #include "config_test_env.h"
 #include "initialization_data.h"
@@ -49,9 +49,11 @@ constexpr size_t kMaxKeyRequestAttempts = 5;
 // Wait time between failed key requests.
 constexpr const auto kRequestRetryWait = std::chrono::milliseconds(10);
 
-const std::vector<uint8_t> kKeyId = a2b_hex("371ea35e1a985d75d198a7f41020dc23");
-const std::vector<uint8_t> kIv = a2b_hex("cedc47cccd6cb437af41325953c2e5e0");
-const std::vector<uint8_t> kEncryptedData = a2b_hex(
+const std::vector<uint8_t> kKeyId =
+    wvutil::a2b_hex("371ea35e1a985d75d198a7f41020dc23");
+const std::vector<uint8_t> kIv =
+    wvutil::a2b_hex("cedc47cccd6cb437af41325953c2e5e0");
+const std::vector<uint8_t> kEncryptedData = wvutil::a2b_hex(
     "6274b3237fe5991ff570ca902e4b3306"
     "8be1e782cc97944686223fe6a2bc0936"
     "71644c1963ffc465b8b5731a9914ce26"
@@ -59,7 +61,7 @@ const std::vector<uint8_t> kEncryptedData = a2b_hex(
     "8f77a6194674e61888803d0d0b5a6670"
     "9b92b79ee5a1ccaa5a6edd290b994657"
     "b201e2fc");
-const std::vector<uint8_t> kClearData = a2b_hex(
+const std::vector<uint8_t> kClearData = wvutil::a2b_hex(
     "21fd60f6e690ff0b0cb5f89540380f92"
     "ca7a3c4326110261d1f88ab33af1e9a3"
     "dc12574b7f55bdac821ddbacfe2f2158"
@@ -313,7 +315,7 @@ TEST_P(ParallelCdmTest, ParallelDecryptsInSameSession) {
   ASSERT_NO_FATAL_FAILURE(CloseSession(session_id));
 }
 
-INSTANTIATE_TEST_CASE_P(Repeated, ParallelCdmTest,
-                        ::testing::Range(0, kRepetitions));
+INSTANTIATE_TEST_SUITE_P(Repeated, ParallelCdmTest,
+                         ::testing::Range(0, kRepetitions));
 
 }  // namespace wvcdm