Handle all possible cdm::Status values before passing through Pepper

media/cdm/ppapi/cdm_adapter.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cdm/ppapi/cdm_adapter.h"
 
 #include "media/base/limits.h"
 #include "media/cdm/ppapi/cdm_file_io_impl.h"
 #include "media/cdm/ppapi/cdm_helpers.h"
 #include "media/cdm/ppapi/cdm_logging.h"
@@ skipping 87 matching lines @@
     case cdm::kSuccess:
       return PP_DECRYPTRESULT_SUCCESS;
     case cdm::kNoKey:
       return PP_DECRYPTRESULT_DECRYPT_NOKEY;
     case cdm::kNeedMoreData:
       return PP_DECRYPTRESULT_NEEDMOREDATA;
     case cdm::kDecryptError:
       return PP_DECRYPTRESULT_DECRYPT_ERROR;
     case cdm::kDecodeError:
       return PP_DECRYPTRESULT_DECODE_ERROR;
-    default:
-      PP_NOTREACHED();
-      return PP_DECRYPTRESULT_DECODE_ERROR;
+    case cdm::kSessionError:
+    case cdm::kDeferredInitialization:
+      // kSessionError and kDeferredInitialization are only used by the
+      // Initialize* methods internally and never returned. DecodeAndDecrypt*

[ddorwin, 2015/04/27 22:43:24]

Deliver* should never use....

[jrummell, 2015/04/27 23:02:25]

Done.

+      // methods should never return these values.
+      break;
   }
+
+  PP_NOTREACHED();
+  return PP_DECRYPTRESULT_DECODE_ERROR;

[ddorwin, 2015/04/27 22:43:24]

DECRYPT? This call can result from just Decrypt() too.

[jrummell, 2015/04/27 23:02:25]

This is what was in the original, and content_decryptor_delegate (receiving end)
converts them into the same error. Changed.

 }
 
 PP_DecryptedFrameFormat CdmVideoFormatToPpDecryptedFrameFormat(
     cdm::VideoFormat format) {
   switch (format) {
     case cdm::kYv12:
       return PP_DECRYPTEDFRAMEFORMAT_YV12;
     case cdm::kI420:
       return PP_DECRYPTEDFRAMEFORMAT_I420;
     default:
@@ skipping 1250 matching lines @@
 }  // namespace media
 
 namespace pp {
 
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new media::CdmAdapterModule();
 }
 
 }  // namespace pp