Ensure keySystem is always provided in keyerror events from Pepper CDMs.

Ensure keySystem is always provided in keyerror events from Pepper CDMs.

This fix required refactoring the code to pass key_system instead of using key_system_.
Due to the limited number of parameters supported by NewCallback, some of them must be grouped together. I chose to group the session-related values.

BUG=169193
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=176160

[xhwang, 2013-01-10 07:16:25]

https://codereview.chromium.org/11830042/diff/1/webkit/media/crypto/ppapi/cdm...
File webkit/media/crypto/ppapi/cdm_wrapper.cc (right):

https://codereview.chromium.org/11830042/diff/1/webkit/media/crypto/ppapi/cdm...
webkit/media/crypto/ppapi/cdm_wrapper.cc:525: struct SessionInfo {
OOC, did you ask pepper team why we can't add support to 4 parameters?

http://code.google.com/searchframe#OAMlx_jo-ck/src/ppapi/utility/completion_c...

https://codereview.chromium.org/11830042/diff/1/webkit/media/crypto/ppapi/cdm...
webkit/media/crypto/ppapi/cdm_wrapper.cc:640: key_system_ = key_system;
do we still need this line?

https://codereview.chromium.org/11830042/diff/1/webkit/media/crypto/ppapi/cdm...
webkit/media/crypto/ppapi/cdm_wrapper.cc:919: 
remove extra line?

[ddorwin, 2013-01-10 07:39:55]

https://codereview.chromium.org/11830042/diff/1/webkit/media/crypto/ppapi/cdm...
File webkit/media/crypto/ppapi/cdm_wrapper.cc (right):

https://codereview.chromium.org/11830042/diff/1/webkit/media/crypto/ppapi/cdm...
webkit/media/crypto/ppapi/cdm_wrapper.cc:525: struct SessionInfo {
On 2013/01/10 07:16:25, xhwang wrote:
> OOC, did you ask pepper team why we can't add support to 4 parameters?
> 
>
http://code.google.com/searchframe#OAMlx_jo-ck/src/ppapi/utility/completion_c...

No. I realize we could add another override, but you have to draw a line
somewhere and putting values in a struct is pretty common for callbacks. (Plus,
this information should eventually be part of a session object anyway.)

https://codereview.chromium.org/11830042/diff/1/webkit/media/crypto/ppapi/cdm...
webkit/media/crypto/ppapi/cdm_wrapper.cc:640: key_system_ = key_system;
On 2013/01/10 07:16:25, xhwang wrote:
> do we still need this line?

No. My intent was to leave the code in working order so that it would still work
when the workaround is removed. Doesn't seem harmful. WDYT?

https://codereview.chromium.org/11830042/diff/1/webkit/media/crypto/ppapi/cdm...
webkit/media/crypto/ppapi/cdm_wrapper.cc:919: 
On 2013/01/10 07:16:25, xhwang wrote:
> remove extra line?

Will do.

[ddorwin, 2013-01-10 18:13:28]

https://codereview.chromium.org/11830042/diff/1/webkit/media/crypto/ppapi/cdm...
File webkit/media/crypto/ppapi/cdm_wrapper.cc (right):

https://codereview.chromium.org/11830042/diff/1/webkit/media/crypto/ppapi/cdm...
webkit/media/crypto/ppapi/cdm_wrapper.cc:919: 
On 2013/01/10 07:39:55, ddorwin wrote:
> On 2013/01/10 07:16:25, xhwang wrote:
> > remove extra line?
> 
> Will do.

Done.

[xhwang, 2013-01-10 18:21:30]

lgtm

https://codereview.chromium.org/11830042/diff/1/webkit/media/crypto/ppapi/cdm...
File webkit/media/crypto/ppapi/cdm_wrapper.cc (right):

https://codereview.chromium.org/11830042/diff/1/webkit/media/crypto/ppapi/cdm...
webkit/media/crypto/ppapi/cdm_wrapper.cc:640: key_system_ = key_system;
On 2013/01/10 07:39:55, ddorwin wrote:
> On 2013/01/10 07:16:25, xhwang wrote:
> > do we still need this line?
> 
> No. My intent was to leave the code in working order so that it would still
work
> when the workaround is removed. Doesn't seem harmful. WDYT?

sg since we already have a TODO to remove line 629.

[commit-bot: I haz the power, 2013-01-10 18:22:46]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ddorwin@chromium.org/11830042/3

[commit-bot: I haz the power, 2013-01-10 21:39:19]

Change committed as 176160