Source release 17.1.0

util/test/cdm_random_unittest.cpp

@@ -1,7 +1,11 @@
 // 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.
 
+#include "cdm_random.h"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include <stdlib.h>
 
 #include <algorithm>
@@ -12,12 +16,7 @@
 #include <type_traits>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "cdm_random.h"
-
-namespace wvcdm {
+namespace wvutil {
 
 namespace {
 // Random data vector lengths.
@@ -173,8 +172,8 @@ TEST_P(CdmRandomGeneratorTest, ThreadSafety) {
   }
 }
 
-INSTANTIATE_TEST_CASE_P(VariousSeeds, CdmRandomGeneratorTest,
-                        testing::ValuesIn(kSeeds));
+INSTANTIATE_TEST_SUITE_P(VariousSeeds, CdmRandomGeneratorTest,
+                         testing::ValuesIn(kSeeds));
 
 TEST(CdmRandomTest, AllMethods) {
   CdmRandom::Rand();
@@ -184,4 +183,4 @@ TEST(CdmRandomTest, AllMethods) {
   CdmRandom::RandomBool();
 }
 
-}  // namespace wvcdm
+}  // namespace wvutil