diff --git a/libwvdrmengine/cdm/core/include/policy_engine.h b/libwvdrmengine/cdm/core/include/policy_engine.h
index fe8b4489..47921b54 100644
--- a/libwvdrmengine/cdm/core/include/policy_engine.h
+++ b/libwvdrmengine/cdm/core/include/policy_engine.h
@@ -32,7 +32,7 @@ class PolicyEngine {
   // UpdateLicense/OnTimerEvent/BeginDecryption and may be out of sync
   // depending on the amount of time elapsed. The current decryption
   // status is not calculated to avoid overhead in the decryption path.
-  virtual bool CanDecrypt(const KeyId& key_id);
+  virtual bool CanDecryptContent(const KeyId& key_id);
 
   // OnTimerEvent is called when a timer fires. It notifies the Policy Engine
   // that the timer has fired and dispatches the relevant events through
diff --git a/libwvdrmengine/cdm/core/src/cdm_session.cpp b/libwvdrmengine/cdm/core/src/cdm_session.cpp
index 744f8630..d176ec19 100644
--- a/libwvdrmengine/cdm/core/src/cdm_session.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_session.cpp
@@ -393,7 +393,8 @@ CdmResponseType CdmSession::Decrypt(const CdmDecryptionParameters& params) {
 
   // Playback may not begin until either the start time passes or the license
   // is updated, so we treat this Decrypt call as invalid.
-  if (params.is_encrypted && !policy_engine_->CanDecrypt(*params.key_id)) {
+  if (params.is_encrypted &&
+      !policy_engine_->CanDecryptContent(*params.key_id)) {
     return policy_engine_->IsLicenseForFuture() ? DECRYPT_NOT_READY : NEED_KEY;
   }
 
diff --git a/libwvdrmengine/cdm/core/src/policy_engine.cpp b/libwvdrmengine/cdm/core/src/policy_engine.cpp
index 65b37750..ba30cef4 100644
--- a/libwvdrmengine/cdm/core/src/policy_engine.cpp
+++ b/libwvdrmengine/cdm/core/src/policy_engine.cpp
@@ -42,11 +42,11 @@ PolicyEngine::PolicyEngine(CdmSessionId session_id,
 
 PolicyEngine::~PolicyEngine() {}
 
-bool PolicyEngine::CanDecrypt(const KeyId& key_id) {
+bool PolicyEngine::CanDecryptContent(const KeyId& key_id) {
   if (license_keys_->IsContentKey(key_id)) {
     return license_keys_->CanDecryptContent(key_id);
   } else {
-    LOGE("PolicyEngine::CanDecrypt Key '%s' not in license.",
+    LOGE("PolicyEngine::CanDecryptContent Key '%s' not in license.",
          b2a_hex(key_id).c_str());
     return false;
   }
diff --git a/libwvdrmengine/cdm/core/test/policy_engine_constraints_unittest.cpp b/libwvdrmengine/cdm/core/test/policy_engine_constraints_unittest.cpp
index 44b1956b..ac322b18 100644
--- a/libwvdrmengine/cdm/core/test/policy_engine_constraints_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/policy_engine_constraints_unittest.cpp
@@ -217,12 +217,12 @@ TEST_F(PolicyEngineConstraintsTest, IsPermissiveWithoutAResolution) {
   policy_engine_->SetLicense(license_);
   policy_engine_->OnTimerEvent();
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId1));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId2));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId3));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId4));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId5));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId6));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId1));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId2));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId3));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId4));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId5));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId6));
 }
 
 TEST_F(PolicyEngineConstraintsTest, HandlesResolutionsBasedOnConstraints) {
@@ -251,30 +251,30 @@ TEST_F(PolicyEngineConstraintsTest, HandlesResolutionsBasedOnConstraints) {
   policy_engine_->SetLicense(license_);
   policy_engine_->NotifyResolution(1, kTargetRes1);
   policy_engine_->OnTimerEvent();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId1));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId2));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId3));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId4));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId5));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId6));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId1));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId2));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId3));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId4));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId5));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId6));
 
   policy_engine_->NotifyResolution(1, kTargetRes2);
   policy_engine_->OnTimerEvent();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId1));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId2));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId3));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId4));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId5));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId6));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId1));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId2));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId3));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId4));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId5));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId6));
 
   policy_engine_->NotifyResolution(1, kTargetRes3);
   policy_engine_->OnTimerEvent();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId1));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId2));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId3));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId4));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId5));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId6));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId1));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId2));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId3));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId4));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId5));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId6));
 }
 
 TEST_F(PolicyEngineConstraintsTest,
@@ -341,21 +341,21 @@ TEST_F(PolicyEngineConstraintsTest, HandlesConstraintOverridingHdcp) {
   policy_engine_->SetLicense(license_);
   policy_engine_->NotifyResolution(1, kTargetRes1);
   policy_engine_->OnTimerEvent();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId1));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId2));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId3));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId4));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId5));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId6));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId1));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId2));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId3));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId4));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId5));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId6));
 
   policy_engine_->NotifyResolution(1, kTargetRes2);
   policy_engine_->OnTimerEvent();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId1));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId2));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId3));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId4));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId5));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId6));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId1));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId2));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId3));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId4));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId5));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId6));
 }
 
 TEST_F(PolicyEngineConstraintsTest, HandlesNoHdcp) {
@@ -388,21 +388,21 @@ TEST_F(PolicyEngineConstraintsTest, HandlesNoHdcp) {
 
   policy_engine_->NotifyResolution(1, kTargetRes1);
   policy_engine_->OnTimerEvent();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId1));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId2));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId3));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId4));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId5));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId6));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId1));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId2));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId3));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId4));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId5));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId6));
 
   policy_engine_->NotifyResolution(1, kTargetRes2);
   policy_engine_->OnTimerEvent();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId1));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId2));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId3));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId4));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId5));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId6));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId1));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId2));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId3));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId4));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId5));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId6));
 }
 
 TEST_F(PolicyEngineConstraintsTest, IgnoresHdcpWithoutAResolution) {
@@ -419,12 +419,12 @@ TEST_F(PolicyEngineConstraintsTest, IgnoresHdcpWithoutAResolution) {
 
   policy_engine_->SetLicense(license_);
   policy_engine_->OnTimerEvent();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId1));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId2));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId3));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId4));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId5));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId6));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId1));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId2));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId3));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId4));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId5));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId6));
 }
 
 }  // namespace wvcdm
diff --git a/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp b/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
index 566e5d14..fad677d3 100644
--- a/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
@@ -149,7 +149,7 @@ class PolicyEngineTest : public ::testing::Test {
 };
 
 TEST_F(PolicyEngineTest, NoLicense) {
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackSuccess_OfflineLicense) {
@@ -168,8 +168,8 @@ TEST_F(PolicyEngineTest, PlaybackSuccess_OfflineLicense) {
   policy_engine_->BeginDecryption();
   policy_engine_->OnTimerEvent();
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kSomeRandomKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kSomeRandomKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackSuccess_StreamingLicense) {
@@ -189,8 +189,8 @@ TEST_F(PolicyEngineTest, PlaybackSuccess_StreamingLicense) {
   policy_engine_->BeginDecryption();
   policy_engine_->OnTimerEvent();
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kSomeRandomKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kSomeRandomKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackFailed_CanPlayFalse) {
@@ -204,12 +204,12 @@ TEST_F(PolicyEngineTest, PlaybackFailed_CanPlayFalse) {
   ExpectSessionKeysChange(kKeyStatusExpired, false);
 
   policy_engine_->SetLicense(license_);
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   policy_engine_->OnTimerEvent();
 
   policy_engine_->BeginDecryption();
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, LicenseExpired_RentalDurationExpiredWithoutPlayback) {
@@ -235,12 +235,12 @@ TEST_F(PolicyEngineTest, LicenseExpired_RentalDurationExpiredWithoutPlayback) {
   policy_engine_->SetLicense(license_);
 
   for (int i = 1; i <= 3; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackOk_RentalDurationPassedWithPlayback) {
@@ -266,12 +266,12 @@ TEST_F(PolicyEngineTest, PlaybackOk_RentalDurationPassedWithPlayback) {
   policy_engine_->BeginDecryption();
 
   for (int i = 1; i <= 2; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackFails_PlaybackDurationExpired) {
@@ -297,12 +297,12 @@ TEST_F(PolicyEngineTest, PlaybackFails_PlaybackDurationExpired) {
   policy_engine_->BeginDecryption();
 
   for (int i = 1; i <= 2; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, LicenseExpired_LicenseDurationExpiredWithoutPlayback) {
@@ -327,12 +327,12 @@ TEST_F(PolicyEngineTest, LicenseExpired_LicenseDurationExpiredWithoutPlayback) {
   policy_engine_->SetLicense(license_);
 
   for (int i = 1; i <= 3; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackFails_ExpiryBeforeRenewalDelay_Offline) {
@@ -360,12 +360,12 @@ TEST_F(PolicyEngineTest, PlaybackFails_ExpiryBeforeRenewalDelay_Offline) {
   policy_engine_->BeginDecryption();
 
   for (int i = 1; i <= 2; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackFails_ExpiryBeforeRenewalDelay_Streaming) {
@@ -393,12 +393,12 @@ TEST_F(PolicyEngineTest, PlaybackFails_ExpiryBeforeRenewalDelay_Streaming) {
   policy_engine_->BeginDecryption();
 
   for (int i = 1; i <= 2; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackOk_RentalDuration0) {
@@ -423,12 +423,12 @@ TEST_F(PolicyEngineTest, PlaybackOk_RentalDuration0) {
   policy_engine_->SetLicense(license_);
 
   for (int i = 1; i <= 3; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackOk_PlaybackDuration0) {
@@ -459,12 +459,12 @@ TEST_F(PolicyEngineTest, PlaybackOk_PlaybackDuration0) {
   policy_engine_->BeginDecryption();
 
   for (int i = 1; i <= 4; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackOk_LicenseDuration0) {
@@ -491,12 +491,12 @@ TEST_F(PolicyEngineTest, PlaybackOk_LicenseDuration0) {
   policy_engine_->BeginDecryption();
 
   for (int i = 1; i <= 2; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackOk_PlaybackAndRental0) {
@@ -518,8 +518,8 @@ TEST_F(PolicyEngineTest, PlaybackOk_PlaybackAndRental0) {
   policy_engine_->BeginDecryption();
   policy_engine_->OnTimerEvent();
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kSomeRandomKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kSomeRandomKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackOk_Durations0) {
@@ -540,12 +540,12 @@ TEST_F(PolicyEngineTest, PlaybackOk_Durations0) {
   policy_engine_->SetLicense(license_);
 
   policy_engine_->BeginDecryption();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   policy_engine_->OnTimerEvent();
   policy_engine_->OnTimerEvent();
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackOk_LicenseWithFutureStartTime) {
@@ -566,13 +566,13 @@ TEST_F(PolicyEngineTest, PlaybackOk_LicenseWithFutureStartTime) {
   policy_engine_->SetLicense(license_);
 
   policy_engine_->OnTimerEvent();
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   policy_engine_->OnTimerEvent();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   policy_engine_->BeginDecryption();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackFailed_CanRenewFalse) {
@@ -604,12 +604,12 @@ TEST_F(PolicyEngineTest, PlaybackFailed_CanRenewFalse) {
   policy_engine_->BeginDecryption();
 
   for (int i = 1; i <= 3; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackOk_RenewSuccess) {
@@ -645,12 +645,12 @@ TEST_F(PolicyEngineTest, PlaybackOk_RenewSuccess) {
   policy_engine_->BeginDecryption();
 
   for (int i = 1; i <= 2; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   license_.set_license_start_time(new_license_start_time);
   policy->set_playback_duration_seconds(2 * kPlaybackDuration);
@@ -661,7 +661,7 @@ TEST_F(PolicyEngineTest, PlaybackOk_RenewSuccess) {
   policy_engine_->OnTimerEvent();
   check_.Call(3);
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackOk_RenewSuccess_WithFutureStartTime) {
@@ -700,11 +700,11 @@ TEST_F(PolicyEngineTest, PlaybackOk_RenewSuccess_WithFutureStartTime) {
   policy_engine_->BeginDecryption();
 
   for (int i = 1; i <= 2; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   license_.set_license_start_time(new_license_start_time);
   LicenseIdentification* id = license_.mutable_id();
@@ -713,11 +713,11 @@ TEST_F(PolicyEngineTest, PlaybackOk_RenewSuccess_WithFutureStartTime) {
 
   policy_engine_->OnTimerEvent();
   check_.Call(3);
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   policy_engine_->OnTimerEvent();
   check_.Call(4);
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, LicenseExpired_RenewFailedVersionNotUpdated) {
@@ -749,12 +749,12 @@ TEST_F(PolicyEngineTest, LicenseExpired_RenewFailedVersionNotUpdated) {
   policy_engine_->SetLicense(license_);
 
   for (int i = 1; i <= 2; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   license_.set_license_start_time(kLicenseStartTime + license_renewal_delay +
                                   30);
@@ -763,12 +763,12 @@ TEST_F(PolicyEngineTest, LicenseExpired_RenewFailedVersionNotUpdated) {
   policy_engine_->OnTimerEvent();
   check_.Call(3);
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   policy_engine_->OnTimerEvent();
   check_.Call(4);
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackFailed_RepeatedRenewFailures) {
@@ -814,11 +814,11 @@ TEST_F(PolicyEngineTest, PlaybackFailed_RepeatedRenewFailures) {
   policy_engine_->BeginDecryption();
 
   for (int i = 1; i <= 8; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackOk_RenewSuccessAfterExpiry) {
@@ -876,11 +876,11 @@ TEST_F(PolicyEngineTest, PlaybackOk_RenewSuccessAfterExpiry) {
   policy_engine_->BeginDecryption();
 
   for (int i = 1; i <= 9; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   license_.set_license_start_time(new_license_start_time);
   LicenseIdentification* id = license_.mutable_id();
@@ -893,7 +893,7 @@ TEST_F(PolicyEngineTest, PlaybackOk_RenewSuccessAfterExpiry) {
   policy_engine_->OnTimerEvent();
   check_.Call(10);
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackOk_RenewSuccessAfterFailures) {
@@ -938,7 +938,7 @@ TEST_F(PolicyEngineTest, PlaybackOk_RenewSuccessAfterFailures) {
   policy_engine_->BeginDecryption();
 
   for (int i = 1; i <= 5; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
@@ -949,11 +949,11 @@ TEST_F(PolicyEngineTest, PlaybackOk_RenewSuccessAfterFailures) {
   policy_engine_->UpdateLicense(license_);
 
   for (int i = 6; i <= 7; ++i) {
-    EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+    EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
     policy_engine_->OnTimerEvent();
     check_.Call(i);
   }
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, PlaybackOk_RenewedWithUsage) {
@@ -992,7 +992,7 @@ TEST_F(PolicyEngineTest, PlaybackOk_RenewedWithUsage) {
   check_.Call(1);
 
   policy_engine_->BeginDecryption();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   policy_engine_->OnTimerEvent();
   check_.Call(2);
@@ -1008,7 +1008,7 @@ TEST_F(PolicyEngineTest, PlaybackOk_RenewedWithUsage) {
   policy_engine_->OnTimerEvent();
   check_.Call(3);
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, MultipleKeysInLicense) {
@@ -1034,10 +1034,10 @@ TEST_F(PolicyEngineTest, MultipleKeysInLicense) {
   EXPECT_CALL(mock_event_listener_, OnExpirationUpdate(_, _));
 
   policy_engine_->SetLicense(license_);
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kAnotherKeyId));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kSigningKeyId));
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kSomeRandomKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kAnotherKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kSigningKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kSomeRandomKeyId));
 }
 
 class PolicyEngineKeyAllowedUsageTest : public PolicyEngineTest {
@@ -1356,7 +1356,7 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_PlaybackBegun) {
   EXPECT_EQ(kRenewalServerUrl, query_info[QUERY_KEY_RENEWAL_SERVER_URL]);
 
   policy_engine_->BeginDecryption();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   policy_engine_->OnTimerEvent();
 
@@ -1394,7 +1394,7 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_Offline) {
   policy_engine_->OnTimerEvent();
 
   policy_engine_->BeginDecryption();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   CdmQueryMap query_info;
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
@@ -1421,7 +1421,7 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_InitialRentalDurationExpired) {
 
   policy_engine_->SetLicense(license_);
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   CdmQueryMap query_info;
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
@@ -1443,7 +1443,7 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_InitialLicenseDurationExpired) {
 
   policy_engine_->SetLicense(license_);
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   CdmQueryMap query_info;
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
@@ -1472,12 +1472,12 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_CanPlayFalse) {
       .WillOnce(Return(kLicenseStartTime + 100));
 
   policy_engine_->SetLicense(license_);
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   policy_engine_->OnTimerEvent();
 
   policy_engine_->BeginDecryption();
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   CdmQueryMap query_info;
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
@@ -1509,13 +1509,13 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_RentalDurationExpired) {
   policy_engine_->SetLicense(license_);
 
   policy_engine_->BeginDecryption();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   for (int i = 1; i <= 2; ++i) {
     policy_engine_->OnTimerEvent();
   }
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   CdmQueryMap query_info;
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
@@ -1547,13 +1547,13 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_PlaybackDurationExpired) {
   policy_engine_->SetLicense(license_);
 
   policy_engine_->BeginDecryption();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   for (int i = 1; i <= 2; ++i) {
     policy_engine_->OnTimerEvent();
   }
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   CdmQueryMap query_info;
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
@@ -1581,13 +1581,13 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_LicenseDurationExpired) {
   policy_engine_->SetLicense(license_);
 
   policy_engine_->BeginDecryption();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   for (int i = 1; i <= 2; ++i) {
     policy_engine_->OnTimerEvent();
   }
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   CdmQueryMap query_info;
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
@@ -1619,13 +1619,13 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_RentalDuration0) {
   policy_engine_->SetLicense(license_);
 
   policy_engine_->BeginDecryption();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   for (int i = 1; i <= 4; ++i) {
     policy_engine_->OnTimerEvent();
   }
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   CdmQueryMap query_info;
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
@@ -1660,7 +1660,7 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_PlaybackDuration0) {
   policy_engine_->SetLicense(license_);
 
   policy_engine_->BeginDecryption();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   for (int i = 1; i <= 2; ++i) {
     policy_engine_->OnTimerEvent();
@@ -1683,7 +1683,7 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_PlaybackDuration0) {
     policy_engine_->OnTimerEvent();
   }
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
   EXPECT_EQ(QUERY_VALUE_STREAMING, query_info[QUERY_KEY_LICENSE_TYPE]);
@@ -1712,13 +1712,13 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_LicenseDuration0) {
   policy_engine_->SetLicense(license_);
 
   policy_engine_->BeginDecryption();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   for (int i = 1; i <= 2; ++i) {
     policy_engine_->OnTimerEvent();
   }
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   CdmQueryMap query_info;
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
@@ -1749,12 +1749,12 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_Durations0) {
   policy_engine_->SetLicense(license_);
 
   policy_engine_->BeginDecryption();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   policy_engine_->OnTimerEvent();
   policy_engine_->OnTimerEvent();
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   CdmQueryMap query_info;
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
@@ -1782,7 +1782,7 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_LicenseWithFutureStartTime) {
   policy_engine_->SetLicense(license_);
 
   policy_engine_->OnTimerEvent();
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   CdmQueryMap query_info;
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
@@ -1797,10 +1797,10 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_LicenseWithFutureStartTime) {
             ParseInt(query_info[QUERY_KEY_PLAYBACK_DURATION_REMAINING]));
   EXPECT_EQ(kRenewalServerUrl, query_info[QUERY_KEY_RENEWAL_SERVER_URL]);
 
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   policy_engine_->OnTimerEvent();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
   policy_engine_->BeginDecryption();
 
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
@@ -1833,13 +1833,13 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_Renew) {
   policy_engine_->SetLicense(license_);
 
   policy_engine_->BeginDecryption();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   for (int i = 1; i <= 2; ++i) {
     policy_engine_->OnTimerEvent();
   }
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   license_.set_license_start_time(kLicenseStartTime + license_renewal_delay +
                                   15);
@@ -1848,7 +1848,7 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_Renew) {
   policy_engine_->UpdateLicense(license_);
 
   policy_engine_->OnTimerEvent();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   CdmQueryMap query_info;
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
@@ -1886,13 +1886,13 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_RenewWithFutureStartTime) {
   policy_engine_->SetLicense(license_);
 
   policy_engine_->BeginDecryption();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   for (int i = 1; i <= 2; ++i) {
     policy_engine_->OnTimerEvent();
   }
 
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   license_.set_license_start_time(kLicenseStartTime + license_renewal_delay +
                                   kLicenseRenewalRetryInterval + 20);
@@ -1901,7 +1901,7 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_RenewWithFutureStartTime) {
   policy_engine_->UpdateLicense(license_);
 
   policy_engine_->OnTimerEvent();
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 
   CdmQueryMap query_info;
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
@@ -1918,7 +1918,7 @@ TEST_F(PolicyEngineQueryTest, QuerySuccess_RenewWithFutureStartTime) {
   EXPECT_EQ(kRenewalServerUrl, query_info[QUERY_KEY_RENEWAL_SERVER_URL]);
 
   policy_engine_->OnTimerEvent();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
 
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
   EXPECT_EQ(QUERY_VALUE_STREAMING, query_info[QUERY_KEY_LICENSE_TYPE]);
@@ -1943,7 +1943,7 @@ TEST_F(PolicyEngineTest, SetLicenseForRelease) {
               OnExpirationUpdate(_, kLicenseStartTime + kRentalDuration));
   policy_engine_->SetLicenseForRelease(license_);
   // No keys were loaded.
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 TEST_F(PolicyEngineTest, SetLicenseForReleaseAfterSetLicense) {
@@ -1961,7 +1961,7 @@ TEST_F(PolicyEngineTest, SetLicenseForReleaseAfterSetLicense) {
   policy_engine_->SetLicense(license_);
   policy_engine_->BeginDecryption();
   policy_engine_->OnTimerEvent();
-  EXPECT_TRUE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_TRUE(policy_engine_->CanDecryptContent(kKeyId));
   ::testing::Mock::VerifyAndClear(&mock_event_listener_);
 
   // Set the license again with use_keys set to false.
@@ -1969,7 +1969,7 @@ TEST_F(PolicyEngineTest, SetLicenseForReleaseAfterSetLicense) {
   // on an existing session.
   ExpectSessionKeysChange(kKeyStatusExpired, false);
   policy_engine_->SetLicenseForRelease(license_);
-  EXPECT_FALSE(policy_engine_->CanDecrypt(kKeyId));
+  EXPECT_FALSE(policy_engine_->CanDecryptContent(kKeyId));
 }
 
 }  // namespace wvcdm