Add type argument to pepper content decryptor method GenerateKeyRequest().

webkit/media/crypto/ppapi/cdm_wrapper.cc

Index: webkit/media/crypto/ppapi/cdm_wrapper.cc
diff --git a/webkit/media/crypto/ppapi/cdm_wrapper.cc b/webkit/media/crypto/ppapi/cdm_wrapper.cc
index 592ac1ed29e96e2fb05013139a23c8f549983242..fb71a0632fd23673e1bbe40f871069f5de47b5b1 100644
--- a/webkit/media/crypto/ppapi/cdm_wrapper.cc
+++ b/webkit/media/crypto/ppapi/cdm_wrapper.cc
@@ -479,6 +479,7 @@ class CdmWrapper : public pp::Instance,
   // Note: Results of calls to these methods must be reported through the
   // PPB_ContentDecryptor_Private interface.
   virtual void GenerateKeyRequest(const std::string& key_system,
+                                  const std::string& mime_type,
                                   pp::VarArrayBuffer init_data) OVERRIDE;
   virtual void AddKey(const std::string& session_id,
                       pp::VarArrayBuffer key,
@@ -582,6 +583,7 @@ CdmWrapper::~CdmWrapper() {
 }
 
 void CdmWrapper::GenerateKeyRequest(const std::string& key_system,
+                                    const std::string& mime_type,
                                     pp::VarArrayBuffer init_data) {
   PP_DCHECK(!key_system.empty());
 
@@ -593,6 +595,8 @@ void CdmWrapper::GenerateKeyRequest(const std::string& key_system,
 
   LinkedKeyMessage key_request(new KeyMessageImpl());
   cdm::Status status = cdm_->GenerateKeyRequest(
+      mime_type.c_str(),
+      mime_type.length(),

[xhwang, 2012/10/26 06:19:30]

Use data() and size() to be consistent with how we treat session_id in other
methods? Also c_str() may trigger an extra copy to append the null terminator.

[Tom Finegan, 2012/10/26 22:51:33]

Done.

       reinterpret_cast<const uint8_t*>(init_data.Map()),
       init_data.ByteLength(),
       key_request.get());