Merge latest oemcrypto-v17 change

No-Typo-Check: Not related to this change.

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/util/test/base64_test.cpp

@@ -2,14 +2,14 @@
 // source code may only be used and distributed under the Widevine License
 // Agreement.
 
-#include <utility>
-
 #include <gtest/gtest.h>
 
+#include <utility>
+
 #include "log.h"
 #include "string_conversions.h"
 
-namespace wvcdm {
+namespace wvutil {
 
 namespace {
 
@@ -189,4 +189,4 @@ TEST_F(HtoNLL64Test, NegativeNumber) {
   int64_t host_byte_order = htonll64(*network_byte_order);
   EXPECT_EQ(-0x01FdFcFbFaF9F8F8, host_byte_order);
 }
-}  // namespace wvcdm
+}  // namespace wvutil

libwvdrmengine/cdm/util/test/cdm_random_unittest.cpp

@@ -2,6 +2,10 @@
 // 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.
@@ -184,4 +183,4 @@ TEST(CdmRandomTest, AllMethods) {
   CdmRandom::RandomBool();
 }
 
-}  // namespace wvcdm
+}  // namespace wvutil

libwvdrmengine/cdm/util/test/file_store_unittest.cpp

@@ -2,14 +2,15 @@
 // source code may only be used and distributed under the Widevine License
 // Agreement.
 
+#include "file_store.h"
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include "cdm_random.h"
-#include "file_store.h"
 #include "test_vectors.h"
 
-namespace wvcdm {
+namespace wvutil {
 
 namespace {
 const std::string kTestDirName = "test_dir";
@@ -31,26 +32,26 @@ class FileTest : public testing::Test {
   void TearDown() override { RemoveTestDir(); }
 
   void RemoveTestDir() {
-    EXPECT_TRUE(file_system_.Remove(test_vectors::kTestDir));
+    EXPECT_TRUE(file_system_.Remove(wvcdm::test_vectors::kTestDir));
   }
 
   FileSystem file_system_;
 };
 
 TEST_F(FileTest, FileExists) {
-  EXPECT_TRUE(file_system_.Exists(test_vectors::kExistentFile));
-  EXPECT_TRUE(file_system_.Exists(test_vectors::kExistentDir));
-  EXPECT_FALSE(file_system_.Exists(test_vectors::kNonExistentFile));
-  EXPECT_FALSE(file_system_.Exists(test_vectors::kNonExistentDir));
+  EXPECT_TRUE(file_system_.Exists(wvcdm::test_vectors::kExistentFile));
+  EXPECT_TRUE(file_system_.Exists(wvcdm::test_vectors::kExistentDir));
+  EXPECT_FALSE(file_system_.Exists(wvcdm::test_vectors::kNonExistentFile));
+  EXPECT_FALSE(file_system_.Exists(wvcdm::test_vectors::kNonExistentDir));
 }
 
 TEST_F(FileTest, RemoveDir) {
-  EXPECT_TRUE(file_system_.Remove(test_vectors::kTestDir));
-  EXPECT_FALSE(file_system_.Exists(test_vectors::kTestDir));
+  EXPECT_TRUE(file_system_.Remove(wvcdm::test_vectors::kTestDir));
+  EXPECT_FALSE(file_system_.Exists(wvcdm::test_vectors::kTestDir));
 }
 
 TEST_F(FileTest, OpenFile) {
-  std::string path = test_vectors::kTestDir + kTestFileName;
+  std::string path = wvcdm::test_vectors::kTestDir + kTestFileName;
   EXPECT_TRUE(file_system_.Remove(path));
 
   std::unique_ptr<File> file = file_system_.Open(path, FileSystem::kCreate);
@@ -60,7 +61,7 @@ TEST_F(FileTest, OpenFile) {
 }
 
 TEST_F(FileTest, RemoveDirAndFile) {
-  std::string path = test_vectors::kTestDir + kTestFileName;
+  std::string path = wvcdm::test_vectors::kTestDir + kTestFileName;
 
   std::unique_ptr<File> file = file_system_.Open(path, FileSystem::kCreate);
   ASSERT_TRUE(file);
@@ -74,15 +75,15 @@ TEST_F(FileTest, RemoveDirAndFile) {
 
   EXPECT_TRUE(file_system_.Exists(path));
   RemoveTestDir();
-  EXPECT_FALSE(file_system_.Exists(test_vectors::kTestDir));
+  EXPECT_FALSE(file_system_.Exists(wvcdm::test_vectors::kTestDir));
   EXPECT_FALSE(file_system_.Exists(path));
 }
 
 TEST_F(FileTest, RemoveWildcardFiles) {
-  std::string path1 = test_vectors::kTestDir + kTestFileName;
-  std::string path2 = test_vectors::kTestDir + kTestFileName2;
+  std::string path1 = wvcdm::test_vectors::kTestDir + kTestFileName;
+  std::string path2 = wvcdm::test_vectors::kTestDir + kTestFileName2;
   std::string wildcard_path =
-      test_vectors::kTestDir + kWildcard + kTestFileNameExt;
+      wvcdm::test_vectors::kTestDir + kWildcard + kTestFileNameExt;
 
   std::unique_ptr<File> file = file_system_.Open(path1, FileSystem::kCreate);
   ASSERT_TRUE(file);
@@ -97,7 +98,7 @@ TEST_F(FileTest, RemoveWildcardFiles) {
 }
 
 TEST_F(FileTest, FileSize) {
-  std::string path = test_vectors::kTestDir + kTestFileName;
+  std::string path = wvcdm::test_vectors::kTestDir + kTestFileName;
   file_system_.Remove(path);
 
   std::string write_data = CdmRandom::RandomData(600);
@@ -111,7 +112,7 @@ TEST_F(FileTest, FileSize) {
 }
 
 TEST_F(FileTest, WriteReadBinaryFile) {
-  std::string path = test_vectors::kTestDir + kTestFileName;
+  std::string path = wvcdm::test_vectors::kTestDir + kTestFileName;
   file_system_.Remove(path);
 
   std::string write_data = CdmRandom::RandomData(600);
@@ -134,10 +135,10 @@ TEST_F(FileTest, ListFiles) {
   std::vector<std::string> names;
 
   std::string not_path("zzz");
-  std::string path1 = test_vectors::kTestDir + kTestFileName;
-  std::string path2 = test_vectors::kTestDir + kTestFileName2;
-  std::string path3 = test_vectors::kTestDir + kTestFileName3;
-  std::string path_dir = test_vectors::kTestDir;
+  std::string path1 = wvcdm::test_vectors::kTestDir + kTestFileName;
+  std::string path2 = wvcdm::test_vectors::kTestDir + kTestFileName2;
+  std::string path3 = wvcdm::test_vectors::kTestDir + kTestFileName3;
+  std::string path_dir = wvcdm::test_vectors::kTestDir;
 
   std::unique_ptr<File> file = file_system_.Open(path1, FileSystem::kCreate);
   ASSERT_TRUE(file);
@@ -181,7 +182,7 @@ TEST_F(FileTest, ListFiles) {
 TEST_F(FileTest, CreateGlobalCertificates) {
   // Clear directory
   std::vector<std::string> names;
-  std::string path_dir = test_vectors::kTestDir;
+  std::string path_dir = wvcdm::test_vectors::kTestDir;
   std::string wild_card_path = path_dir + kWildcard;
   file_system_.Remove(wild_card_path);
   if (file_system_.List(path_dir, &names)) {
@@ -189,9 +190,10 @@ TEST_F(FileTest, CreateGlobalCertificates) {
   }
 
   // Create certificates and verify that they exist
-  std::string certificate_path = test_vectors::kTestDir + kCertificateFileName;
+  std::string certificate_path =
+      wvcdm::test_vectors::kTestDir + kCertificateFileName;
   std::string legacy_certificate_path =
-      test_vectors::kTestDir + kLegacyCertificateFileName;
+      wvcdm::test_vectors::kTestDir + kLegacyCertificateFileName;
 
   std::unique_ptr<File> file =
       file_system_.Open(certificate_path, FileSystem::kCreate);
@@ -214,16 +216,17 @@ TEST_F(FileTest, CreateGlobalCertificates) {
 TEST_F(FileTest, CreateCertificates) {
   // Clear directory
   std::vector<std::string> names;
-  std::string path_dir = test_vectors::kTestDir;
+  std::string path_dir = wvcdm::test_vectors::kTestDir;
   std::string wild_card_path = path_dir + kWildcard;
   file_system_.Remove(wild_card_path);
   if (file_system_.List(path_dir, &names)) {
     EXPECT_EQ(0u, names.size());
   }
 
-  std::string certificate_path = test_vectors::kTestDir + kCertificateFileName;
+  std::string certificate_path =
+      wvcdm::test_vectors::kTestDir + kCertificateFileName;
   std::string legacy_certificate_path =
-      test_vectors::kTestDir + kLegacyCertificateFileName;
+      wvcdm::test_vectors::kTestDir + kLegacyCertificateFileName;
 
   // Create Global certificates
   std::unique_ptr<File> file =
@@ -285,16 +288,17 @@ TEST_F(FileTest, CreateCertificates) {
 TEST_F(FileTest, RemoveCertificates) {
   // Clear directory
   std::vector<std::string> names;
-  std::string path_dir = test_vectors::kTestDir;
+  std::string path_dir = wvcdm::test_vectors::kTestDir;
   std::string wild_card_path = path_dir + kWildcard;
   file_system_.Remove(wild_card_path);
   if (file_system_.List(path_dir, &names)) {
     EXPECT_EQ(0u, names.size());
   }
 
-  std::string certificate_path = test_vectors::kTestDir + kCertificateFileName;
+  std::string certificate_path =
+      wvcdm::test_vectors::kTestDir + kCertificateFileName;
   std::string legacy_certificate_path =
-      test_vectors::kTestDir + kLegacyCertificateFileName;
+      wvcdm::test_vectors::kTestDir + kLegacyCertificateFileName;
 
   // Create Global certificates
   std::unique_ptr<File> file =
@@ -330,30 +334,34 @@ TEST_F(FileTest, RemoveCertificates) {
   // Remove all even number listed files
   for (size_t i = 0; i < names.size(); ++i) {
     if (i % 2 == 0) {
-      EXPECT_TRUE(file_system_.Remove(test_vectors::kTestDir + names[i]));
+      EXPECT_TRUE(
+          file_system_.Remove(wvcdm::test_vectors::kTestDir + names[i]));
     }
   }
 
   // Verify that they have been removed
   for (size_t i = 0; i < names.size(); ++i) {
     if (i % 2 == 1) {
-      EXPECT_TRUE(file_system_.Exists(test_vectors::kTestDir + names[i]));
+      EXPECT_TRUE(
+          file_system_.Exists(wvcdm::test_vectors::kTestDir + names[i]));
     } else {
-      EXPECT_FALSE(file_system_.Exists(test_vectors::kTestDir + names[i]));
+      EXPECT_FALSE(
+          file_system_.Exists(wvcdm::test_vectors::kTestDir + names[i]));
     }
   }
 
   // Remove all odd number listed files
   for (size_t i = 0; i < names.size(); ++i) {
     if (i % 2 == 1) {
-      EXPECT_TRUE(file_system_.Remove(test_vectors::kTestDir + names[i]));
+      EXPECT_TRUE(
+          file_system_.Remove(wvcdm::test_vectors::kTestDir + names[i]));
     }
   }
 
   // Verify that all have been removed
   for (size_t i = 0; i < names.size(); ++i) {
-    EXPECT_FALSE(file_system_.Exists(test_vectors::kTestDir + names[i]));
+    EXPECT_FALSE(file_system_.Exists(wvcdm::test_vectors::kTestDir + names[i]));
   }
 }
 
-}  // namespace wvcdm
+}  // namespace wvutil

libwvdrmengine/cdm/util/test/file_utils_unittest.cpp

@@ -10,7 +10,7 @@
 #include "file_store.h"
 #include "test_vectors.h"
 
-namespace wvcdm {
+namespace wvutil {
 
 namespace {
 const std::string kTestDirName = "test_dir";
@@ -31,14 +31,14 @@ class FileUtilsTest : public testing::Test {
   virtual void TearDown() { RemoveTestDir(); }
 
   void CreateTestDir() {
-    if (!file_system_.Exists(test_vectors::kTestDir)) {
-      EXPECT_TRUE(FileUtils::CreateDirectory(test_vectors::kTestDir));
+    if (!file_system_.Exists(wvcdm::test_vectors::kTestDir)) {
+      EXPECT_TRUE(FileUtils::CreateDirectory(wvcdm::test_vectors::kTestDir));
     }
-    EXPECT_TRUE(file_system_.Exists(test_vectors::kTestDir));
+    EXPECT_TRUE(file_system_.Exists(wvcdm::test_vectors::kTestDir));
   }
 
   void RemoveTestDir() {
-    EXPECT_TRUE(file_system_.Remove(test_vectors::kTestDir));
+    EXPECT_TRUE(file_system_.Remove(wvcdm::test_vectors::kTestDir));
   }
 
   void CreateTestFile(const std::string file_path) {
@@ -63,43 +63,43 @@ class FileUtilsTest : public testing::Test {
 };
 
 TEST_F(FileUtilsTest, CreateDirectory) {
-  std::string dir_wo_delimiter =
-      test_vectors::kTestDir.substr(0, test_vectors::kTestDir.size() - 1);
+  std::string dir_wo_delimiter = wvcdm::test_vectors::kTestDir.substr(
+      0, wvcdm::test_vectors::kTestDir.size() - 1);
   if (file_system_.Exists(dir_wo_delimiter))
     EXPECT_TRUE(file_system_.Remove(dir_wo_delimiter));
   EXPECT_FALSE(file_system_.Exists(dir_wo_delimiter));
   EXPECT_TRUE(FileUtils::CreateDirectory(dir_wo_delimiter));
   EXPECT_TRUE(file_system_.Exists(dir_wo_delimiter));
   EXPECT_TRUE(file_system_.Remove(dir_wo_delimiter));
-  EXPECT_TRUE(FileUtils::CreateDirectory(test_vectors::kTestDir));
-  EXPECT_TRUE(file_system_.Exists(test_vectors::kTestDir));
-  EXPECT_TRUE(file_system_.Remove(test_vectors::kTestDir));
+  EXPECT_TRUE(FileUtils::CreateDirectory(wvcdm::test_vectors::kTestDir));
+  EXPECT_TRUE(file_system_.Exists(wvcdm::test_vectors::kTestDir));
+  EXPECT_TRUE(file_system_.Remove(wvcdm::test_vectors::kTestDir));
 }
 
 TEST_F(FileUtilsTest, IsDir) {
-  std::string path = test_vectors::kTestDir + kTestFileName;
+  std::string path = wvcdm::test_vectors::kTestDir + kTestFileName;
   std::unique_ptr<File> file = file_system_.Open(path, FileSystem::kCreate);
   EXPECT_TRUE(file);
 
   EXPECT_TRUE(file_system_.Exists(path));
-  EXPECT_TRUE(file_system_.Exists(test_vectors::kTestDir));
+  EXPECT_TRUE(file_system_.Exists(wvcdm::test_vectors::kTestDir));
   EXPECT_FALSE(FileUtils::IsDirectory(path));
-  EXPECT_TRUE(FileUtils::IsDirectory(test_vectors::kTestDir));
+  EXPECT_TRUE(FileUtils::IsDirectory(wvcdm::test_vectors::kTestDir));
 }
 
 TEST_F(FileUtilsTest, IsRegularFile) {
-  std::string path = test_vectors::kTestDir + kTestFileName;
+  std::string path = wvcdm::test_vectors::kTestDir + kTestFileName;
   std::unique_ptr<File> file = file_system_.Open(path, FileSystem::kCreate);
   EXPECT_TRUE(file);
 
   EXPECT_TRUE(file_system_.Exists(path));
-  EXPECT_TRUE(file_system_.Exists(test_vectors::kTestDir));
+  EXPECT_TRUE(file_system_.Exists(wvcdm::test_vectors::kTestDir));
   EXPECT_TRUE(FileUtils::IsRegularFile(path));
-  EXPECT_FALSE(FileUtils::IsRegularFile(test_vectors::kTestDir));
+  EXPECT_FALSE(FileUtils::IsRegularFile(wvcdm::test_vectors::kTestDir));
 }
 
 TEST_F(FileUtilsTest, CopyFile) {
-  std::string path = test_vectors::kTestDir + kTestFileName;
+  std::string path = wvcdm::test_vectors::kTestDir + kTestFileName;
   file_system_.Remove(path);
 
   std::string write_data = GenerateRandomData(600);
@@ -110,7 +110,7 @@ TEST_F(FileUtilsTest, CopyFile) {
             write_data_size);
   ASSERT_TRUE(file_system_.Exists(path));
 
-  std::string path_copy = test_vectors::kTestDir + kTestFileName2;
+  std::string path_copy = wvcdm::test_vectors::kTestDir + kTestFileName2;
   EXPECT_FALSE(file_system_.Exists(path_copy));
   EXPECT_TRUE(FileUtils::Copy(path, path_copy));
 
@@ -127,15 +127,15 @@ TEST_F(FileUtilsTest, CopyFile) {
 
 TEST_F(FileUtilsTest, ListEmptyDirectory) {
   std::vector<std::string> files;
-  EXPECT_TRUE(FileUtils::List(test_vectors::kTestDir, &files));
+  EXPECT_TRUE(FileUtils::List(wvcdm::test_vectors::kTestDir, &files));
   EXPECT_EQ(0u, files.size());
 }
 
 TEST_F(FileUtilsTest, ListFiles) {
-  std::string path = test_vectors::kTestDir + kTestDirName;
+  std::string path = wvcdm::test_vectors::kTestDir + kTestDirName;
   EXPECT_TRUE(FileUtils::CreateDirectory(path));
 
-  path = test_vectors::kTestDir + kTestFileName;
+  path = wvcdm::test_vectors::kTestDir + kTestFileName;
   std::string write_data = GenerateRandomData(600);
   size_t write_data_size = write_data.size();
   std::unique_ptr<File> file = file_system_.Open(path, FileSystem::kCreate);
@@ -143,7 +143,7 @@ TEST_F(FileUtilsTest, ListFiles) {
   EXPECT_EQ(file->Write(write_data.data(), write_data_size), write_data_size);
   EXPECT_TRUE(file_system_.Exists(path));
 
-  path = test_vectors::kTestDir + kTestFileName2;
+  path = wvcdm::test_vectors::kTestDir + kTestFileName2;
   write_data = GenerateRandomData(600);
   write_data_size = write_data.size();
   file = file_system_.Open(path, FileSystem::kCreate);
@@ -152,7 +152,7 @@ TEST_F(FileUtilsTest, ListFiles) {
   EXPECT_TRUE(file_system_.Exists(path));
 
   std::vector<std::string> files;
-  EXPECT_TRUE(FileUtils::List(test_vectors::kTestDir, &files));
+  EXPECT_TRUE(FileUtils::List(wvcdm::test_vectors::kTestDir, &files));
   EXPECT_EQ(3u, files.size());
 
   for (size_t i = 0; i < files.size(); ++i) {
@@ -162,7 +162,7 @@ TEST_F(FileUtilsTest, ListFiles) {
 }
 
 TEST_F(FileUtilsTest, RemoveDirectory) {
-  std::string path = test_vectors::kTestDir;
+  std::string path = wvcdm::test_vectors::kTestDir;
   EXPECT_TRUE(FileUtils::CreateDirectory(path));
   EXPECT_TRUE(FileUtils::Exists(path));
 
@@ -171,8 +171,8 @@ TEST_F(FileUtilsTest, RemoveDirectory) {
 }
 
 TEST_F(FileUtilsTest, RemoveTopLevelDirectory) {
-  std::string base_path = test_vectors::kTestDir;
-  std::string sub_dir_path = test_vectors::kTestDir + kTestDirName;
+  std::string base_path = wvcdm::test_vectors::kTestDir;
+  std::string sub_dir_path = wvcdm::test_vectors::kTestDir + kTestDirName;
   EXPECT_TRUE(FileUtils::CreateDirectory(sub_dir_path));
   EXPECT_TRUE(FileUtils::Exists(sub_dir_path));
 
@@ -191,7 +191,7 @@ TEST_F(FileUtilsTest, RemoveTopLevelDirectory) {
 }
 
 TEST_F(FileUtilsTest, RemoveFilesUsingWildcard) {
-  std::string base_path = test_vectors::kTestDir + kTestDirName;
+  std::string base_path = wvcdm::test_vectors::kTestDir + kTestDirName;
   EXPECT_TRUE(FileUtils::CreateDirectory(base_path));
   EXPECT_TRUE(FileUtils::Exists(base_path));
 
@@ -221,7 +221,7 @@ TEST_F(FileUtilsTest, RemoveFilesUsingWildcard) {
 }
 
 TEST_F(FileUtilsTest, RemoveFilesUsingWildcardAndExtension) {
-  std::string base_path = test_vectors::kTestDir + kTestDirName;
+  std::string base_path = wvcdm::test_vectors::kTestDir + kTestDirName;
   EXPECT_TRUE(FileUtils::CreateDirectory(base_path));
   EXPECT_TRUE(FileUtils::Exists(base_path));
 
@@ -252,7 +252,7 @@ TEST_F(FileUtilsTest, RemoveFilesUsingWildcardAndExtension) {
 }
 
 TEST_F(FileUtilsTest, RemoveFilesUsingPrefixAndWildcard) {
-  std::string base_path = test_vectors::kTestDir + kTestDirName;
+  std::string base_path = wvcdm::test_vectors::kTestDir + kTestDirName;
   EXPECT_TRUE(FileUtils::CreateDirectory(base_path));
   EXPECT_TRUE(FileUtils::Exists(base_path));
 
@@ -283,7 +283,7 @@ TEST_F(FileUtilsTest, RemoveFilesUsingPrefixAndWildcard) {
 }
 
 TEST_F(FileUtilsTest, RemoveFilesUsingPrefixWildcardAndExtension) {
-  std::string base_path = test_vectors::kTestDir + kTestDirName;
+  std::string base_path = wvcdm::test_vectors::kTestDir + kTestDirName;
   EXPECT_TRUE(FileUtils::CreateDirectory(base_path));
   EXPECT_TRUE(FileUtils::Exists(base_path));
 
@@ -314,4 +314,4 @@ TEST_F(FileUtilsTest, RemoveFilesUsingPrefixWildcardAndExtension) {
   EXPECT_TRUE(FileUtils::Exists(file_path_with_different_prefix));
 }
 
-}  // namespace wvcdm
+}  // namespace wvutil

libwvdrmengine/cdm/util/test/test_clock.cpp

@@ -4,13 +4,12 @@
 //
 // Clock - A fake clock just for running tests.
 
-#include "clock.h"
-
 #include <chrono>
 
+#include "clock.h"
 #include "test_sleep.h"
 
-namespace wvcdm {
+namespace wvutil {
 
 namespace {
 // A fake clock that only advances when TestSleep::Sleep is called.
@@ -40,4 +39,4 @@ int64_t Clock::GetCurrentTime() {
   return g_fake_clock->now() / 1000;
 }
 
-}  // namespace wvcdm
+}  // namespace wvutil

libwvdrmengine/cdm/util/test/test_sleep.cpp

@@ -22,7 +22,7 @@
 #include "clock.h"
 #include "log.h"
 
-namespace wvcdm {
+namespace wvutil {
 
 bool TestSleep::real_sleep_ = true;
 TestSleep::CallBack* TestSleep::callback_ = nullptr;
@@ -157,4 +157,4 @@ bool TestSleep::CanChangeSystemTime() {
   return false;
 #endif
 }
-}  // namespace wvcdm
+}  // namespace wvutil

libwvdrmengine/cdm/util/test/test_sleep.h

@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-namespace wvcdm {
+namespace wvutil {
 
 class TestSleep {
  public:
@@ -70,6 +70,6 @@ class TestSleep {
   static int total_clock_rollback_seconds_;
 };
 
-}  // namespace wvcdm
+}  // namespace wvutil
 
 #endif  // WVCDM_UTIL_TEST_SLEEP_H_