Source release 16.4.0

core/test/test_base.h

@@ -76,6 +76,27 @@ class WvCdmTestBase : public ::testing::Test {
   bool binary_provisioning_;
 };
 
+// This just makes the constructor public so that we can create one with dummy
+// metrics and file system.
+class TestCdmEngine : public CdmEngine {
+ public:
+  TestCdmEngine(FileSystem* file_system,
+                std::shared_ptr<metrics::EngineMetrics> metrics)
+      : CdmEngine(file_system, metrics) {}
+};
+
+class WvCdmTestBaseWithEngine : public WvCdmTestBase {
+ public:
+  WvCdmTestBaseWithEngine()
+      : dummy_engine_metrics_(new metrics::EngineMetrics()),
+        cdm_engine_(&file_system_, dummy_engine_metrics_) {}
+
+ protected:
+  FileSystem file_system_;
+  shared_ptr<metrics::EngineMetrics> dummy_engine_metrics_;
+  TestCdmEngine cdm_engine_;
+};
+
 class TestCryptoSession : public CryptoSession {
  public:
   explicit TestCryptoSession(metrics::CryptoMetrics* crypto_metrics);