Source release 18.5.0

cdm/test/perf_test.cpp

@@ -20,6 +20,7 @@
 
 #include "config_test_env.h"
 #include "license_request.h"
+#include "logger_global.h"
 #include "test_host.h"
 #include "url_request.h"
 
@@ -29,6 +30,7 @@
 #define WALL_NOW std::chrono::high_resolution_clock::now()
 
 TestHost* g_host = nullptr;
+widevine::StderrLogger g_stderr_logger;
 
 namespace widevine {
 
@@ -145,6 +147,8 @@ class EventListener : public Cdm::IEventListener {
   }
   void onKeyStatusesChange(const std::string& session_id,
                            bool has_new_usable_key) override {}
+  void onExpirationChange(const std::string& session_id,
+                          int64_t new_expiration) override {}
   void onRemoveComplete(const std::string& session_id) override {}
 
   std::vector<MessageInfo> messages;
@@ -182,6 +186,10 @@ class GlobalEnv : public testing::Environment {
       : init_func_(init_func), cert_(cert) {}
 
   void SetUp() override {
+    // Manually set the logger because `TestHost` makes logging calls before
+    // the global logger is set in |init_func_|.
+    g_logger = &g_stderr_logger;
+
     g_host = new TestHost;
     if (!cert_.empty()) g_host->per_origin_storage().write("cert.bin", cert_);