Make cdm::Status error names more specific.

Replace kError with kDecryptError, kDecodeError, and kKeyError. Update
usage sites accordingly.

BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/11021006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159583 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 15 insertions, 8 deletions

diff --git a/webkit/media/crypto/ppapi/cdm_wrapper.cc b/webkit/media/crypto/ppapi/cdm_wrapper.cc
index 75c69d2..407335f 100644
--- a/webkit/media/crypto/ppapi/cdm_wrapper.cc
+++ b/webkit/media/crypto/ppapi/cdm_wrapper.cc
@@ -302,7 +302,7 @@ void CdmWrapper::GenerateKeyRequest(const std::string& key_system,
       reinterpret_cast<const uint8_t*>(init_data.Map()),
       init_data.ByteLength(),
       key_request.get());
-
+  PP_DCHECK(status == cdm::kSuccess || status == cdm::kSessionError);
   if (status != cdm::kSuccess ||
       !key_request->message() ||
       key_request->message()->size() == 0) {
@@ -338,7 +338,7 @@ void CdmWrapper::AddKey(const std::string& session_id,
   cdm::Status status = cdm_->AddKey(session_id.data(), session_id.size(),
                                     key_ptr, key_size,
                                     init_data_ptr, init_data_size);
-
+  PP_DCHECK(status == cdm::kSuccess || status == cdm::kSessionError);
   if (status != cdm::kSuccess) {
     CallOnMain(callback_factory_.NewCallback(&CdmWrapper::KeyError,
                                              session_id));
@@ -352,6 +352,7 @@ void CdmWrapper::CancelKeyRequest(const std::string& session_id) {
   PP_DCHECK(cdm_);
   cdm::Status status = cdm_->CancelKeyRequest(session_id.data(),
                                               session_id.size());
+  PP_DCHECK(status == cdm::kSuccess || status == cdm::kSessionError);
   if (status != cdm::kSuccess) {
     CallOnMain(callback_factory_.NewCallback(&CdmWrapper::KeyError,
                                              session_id));
@@ -444,8 +445,10 @@ void CdmWrapper::DeliverBlock(int32_t result,
     case cdm::kNoKey:
       decrypted_block_info.result = PP_DECRYPTRESULT_DECRYPT_NOKEY;
       break;
+    case cdm::kSessionError:
     default:
       decrypted_block_info.result = PP_DECRYPTRESULT_DECRYPT_ERROR;
+      PP_DCHECK(false);
   }
 
   const pp::Buffer_Dev& buffer =
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc
index b04b614..74e117c 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.cc
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc
@@ -139,7 +139,7 @@ cdm::Status ClearKeyCdm::GenerateKeyRequest(const uint8_t* init_data,
   decryptor_.GenerateKeyRequest("", init_data, init_data_size);
 
   if (client_.status() != Client::kKeyMessage)
-    return cdm::kError;
+    return cdm::kSessionError;
 
   DCHECK(key_request);
   key_request->set_session_id(client_.session_id().data(),
@@ -172,7 +172,7 @@ cdm::Status ClearKeyCdm::AddKey(const char* session_id,
                     std::string(session_id, session_id_size));
 
   if (client_.status() != Client::kKeyAdded)
-    return cdm::kError;
+    return cdm::kSessionError;
 
   return cdm::kSuccess;
 }
@@ -210,7 +210,7 @@ cdm::Status ClearKeyCdm::Decrypt(
                      base::Bind(&CopyDecryptResults, &status, &buffer));
 
   if (status == media::Decryptor::kError)
-    return cdm::kError;
+    return cdm::kDecryptError;
 
   if (status == media::Decryptor::kNoKey)
     return cdm::kNoKey;
@@ -230,14 +230,16 @@ cdm::Status ClearKeyCdm::Decrypt(
 cdm::Status ClearKeyCdm::InitializeVideoDecoder(
     const cdm::VideoDecoderConfig& video_decoder_config) {
   NOTIMPLEMENTED();
-  return cdm::kError;
+  // TODO(tomfinegan): Determine the proper error to return here once there
+  // are callers for this method.
+  return cdm::kSessionError;
 }
 
 cdm::Status ClearKeyCdm::DecryptAndDecodeVideo(
     const cdm::InputBuffer& encrypted_buffer,
     cdm::VideoFrame* video_frame) {
   NOTIMPLEMENTED();
-  return cdm::kError;
+  return cdm::kDecryptError;
 }
 
 void ClearKeyCdm::ResetVideoDecoder() {
diff --git a/webkit/media/crypto/ppapi/content_decryption_module.h b/webkit/media/crypto/ppapi/content_decryption_module.h
index 3076cfc..6ff2892 100644
--- a/webkit/media/crypto/ppapi/content_decryption_module.h
+++ b/webkit/media/crypto/ppapi/content_decryption_module.h
@@ -37,7 +37,9 @@ enum Status {
   kSuccess = 0,
   kNeedMoreData,  // Decoder needs more data to produce a decoded frame/sample.
   kNoKey,  // The required decryption key is not available.
-  kError
+  kSessionError,  // Session management error.
+  kDecryptError,  // Decryption failed.
+  kDecodeError  // Error decoding audio or video.
 };
 
 // An input buffer can be split into several continuous subsamples.