Source release 19.5.0

cdm/test/test_host.h

@@ -16,11 +16,11 @@
 // This provides a host environment for running CDM tests. It implements the
 // IStorage, IClock and ITimer interfaces that a host would normally implement,
 // while allowing them to be manipulated by the test.
-class TestHost : public widevine::Cdm::IClock,
-                 public widevine::Cdm::ITimer,
+class TestHost : public CDM_NAMESPACE::Cdm::IClock,
+                 public CDM_NAMESPACE::Cdm::ITimer,
                  public wvutil::TestSleep::CallBack {
  public:
-  class Storage : public widevine::Cdm::IStorage {
+  class Storage : public CDM_NAMESPACE::Cdm::IStorage {
    public:
     typedef std::map<std::string, std::string> StorageMap;
 
@@ -36,7 +36,7 @@ class TestHost : public widevine::Cdm::IClock,
     void ResetFiles(const StorageMap& files) { files_ = files; };
     const StorageMap& files() const { return files_; }
 
-    // widevine::Cdm::IStorage
+    // CDM_NAMESPACE::Cdm::IStorage
     bool read(const std::string& name, std::string* data) override;
     bool write(const std::string& name, const std::string& data) override;
     bool exists(const std::string& name) override;
@@ -62,10 +62,10 @@ class TestHost : public widevine::Cdm::IClock,
   Storage& global_storage() { return global_storage_; }
   Storage& per_origin_storage() { return per_origin_storage_; }
 
-  // widevine::Cdm::IClock
+  // CDM_NAMESPACE::Cdm::IClock
   int64_t now() override;
 
-  // widevine::Cdm::ITimer
+  // CDM_NAMESPACE::Cdm::ITimer
   void setTimeout(int64_t delay_ms, IClient* client, void* context) override;
   void cancel(IClient* client) override;
 
@@ -107,7 +107,7 @@ class TestHost : public widevine::Cdm::IClock,
 
 // Owned and managed by the test runner.
 extern TestHost* g_host;
-extern widevine::StderrLogger g_stderr_logger;
+extern CDM_NAMESPACE::StderrLogger g_stderr_logger;
 extern std::string g_sandbox_id;
 
 #endif  // WVCDM_CDM_TEST_TEST_HOST_H_