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 79 matching lines @@
     input_buffer->subsamples = &(*subsamples)[0];
   }
 
   input_buffer->timestamp = encrypted_block_info.tracking_info.timestamp;
 }
 
 PP_DecryptResult CdmStatusToPpDecryptResult(cdm::Status status) {
   switch (status) {
     case cdm::kSuccess:
       return PP_DECRYPTRESULT_SUCCESS;
+    case cdm::kNeedMoreData:
+      return PP_DECRYPTRESULT_NEEDMOREDATA;
     case cdm::kNoKey:
       return PP_DECRYPTRESULT_DECRYPT_NOKEY;
-    case cdm::kNeedMoreData:
-      return PP_DECRYPTRESULT_NEEDMOREDATA;
+    case cdm::kSessionError:

[ddorwin, 2015/04/23 00:33:42]

This also appears to only be used by the Initialize* methods. If so, we should
rename it. You'll need to consult with the CDM team to confirm this, but
clear_key_cdm.cc also uses it there.

[jrummell, 2015/04/23 21:10:15]

Fixed.

+      return PP_DECRYPTRESULT_SESSION_ERROR;
     case cdm::kDecryptError:
       return PP_DECRYPTRESULT_DECRYPT_ERROR;
     case cdm::kDecodeError:
       return PP_DECRYPTRESULT_DECODE_ERROR;
+    case cdm::kDeferredInitialization:

[ddorwin, 2015/04/23 00:33:42]

This is only expected from the Initialize* methods where it is explicitly
handled. No other function should return it, and there is no reason to define
Pepper values for it.

If we want to explicitly handle all values, that's fine, but we should just fall
into the default case.

[jrummell, 2015/04/23 21:10:15]

Fixed.

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