Source release 15.0.0

core/test/test_base.h

@@ -20,8 +20,8 @@ namespace wvcdm {
 class WvCdmTestBase : public ::testing::Test {
  public:
   WvCdmTestBase() : config_(default_config_), binary_provisioning_(false) {}
-  virtual ~WvCdmTestBase() {}
-  virtual void SetUp();
+  ~WvCdmTestBase() override {}
+  void SetUp() override;
   virtual std::string binary_key_id() const { return a2bs_hex(config_.key_id()); }
 
   // Returns true if the test program should continue, if false, the caller
@@ -71,7 +71,7 @@ class TestCryptoSession  : public CryptoSession {
   explicit TestCryptoSession(metrics::CryptoMetrics* crypto_metrics);
   // This intercepts nonce flood errors, which is useful for tests that request
   // many nonces and are not time critical.
-  bool GenerateNonce(uint32_t* nonce);
+  CdmResponseType GenerateNonce(uint32_t* nonce);
 };
 
 // A holder for a license.  Users of this class will first open a session with