summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjrummell <jrummell@chromium.org>2015-05-28 16:37:01 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-28 23:37:32 +0000
commit74b4ef1610803c75ec6155845cb939bee8dc2036 (patch)
treeecff0d6adc4423750f047575f7e7a8fb5017e9af
parentb357fe4797916cb7983327e21ac9995f63b28816 (diff)
downloadchromium_src-74b4ef1610803c75ec6155845cb939bee8dc2036.zip
chromium_src-74b4ef1610803c75ec6155845cb939bee8dc2036.tar.gz
chromium_src-74b4ef1610803c75ec6155845cb939bee8dc2036.tar.bz2
Mark LoadSession() and RemoveSession() as never reached
BUG=384152,492823 TEST=EME tests still pass Review URL: https://codereview.chromium.org/1166453002 Cr-Commit-Position: refs/heads/master@{#331881}
-rw-r--r--content/renderer/media/crypto/proxy_media_keys.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/content/renderer/media/crypto/proxy_media_keys.cc b/content/renderer/media/crypto/proxy_media_keys.cc
index 4092324..cec2e91 100644
--- a/content/renderer/media/crypto/proxy_media_keys.cc
+++ b/content/renderer/media/crypto/proxy_media_keys.cc
@@ -94,9 +94,7 @@ void ProxyMediaKeys::LoadSession(
SessionType session_type,
const std::string& session_id,
scoped_ptr<media::NewSessionCdmPromise> promise) {
- // TODO(xhwang): Check key system and platform support for LoadSession in
- // blink and add NOTREACHED() here. See http://crbug.com/384152
- DLOG(ERROR) << "ProxyMediaKeys doesn't support session loading.";
+ NOTREACHED() << "ProxyMediaKeys doesn't support persistent sessions.";
promise->reject(NOT_SUPPORTED_ERROR, 0, "LoadSession() is not supported.");
}
@@ -117,8 +115,7 @@ void ProxyMediaKeys::CloseSession(const std::string& session_id,
void ProxyMediaKeys::RemoveSession(
const std::string& session_id,
scoped_ptr<media::SimpleCdmPromise> promise) {
- // TODO(xhwang): Check key system and platform support for LoadSession in
- // blink and add NOTREACHED() here. See http://crbug.com/384152
+ NOTREACHED() << "ProxyMediaKeys doesn't support persistent sessions.";
promise->reject(NOT_SUPPORTED_ERROR, 0, "RemoveSession() not supported.");
}