Separate MediaKeys interface from Decryptor interface.

webkit/media/crypto/ppapi_decryptor.cc

Index: webkit/media/crypto/ppapi_decryptor.cc
diff --git a/webkit/media/crypto/ppapi_decryptor.cc b/webkit/media/crypto/ppapi_decryptor.cc
index 7f45178ca6a88dc73a6f3d314debed7bfafd625e..7777a661b8d600d6ab0337538006e4d62d343cb0 100644
--- a/webkit/media/crypto/ppapi_decryptor.cc
+++ b/webkit/media/crypto/ppapi_decryptor.cc
@@ -105,6 +105,10 @@ void PpapiDecryptor::CancelKeyRequest(const std::string& key_system,
     ReportFailureToCallPlugin(key_system, session_id);
 }
 
+media::MediaKeys* PpapiDecryptor::GetMediaKeys() {
+  return this;
+}
+
 void PpapiDecryptor::RegisterNewKeyCB(StreamType stream_type,
                                       const NewKeyCB& new_key_cb) {
   switch (stream_type) {
@@ -264,7 +268,7 @@ void PpapiDecryptor::KeyAdded(const std::string& key_system,
 
 void PpapiDecryptor::KeyError(const std::string& key_system,
                               const std::string& session_id,
-                              media::Decryptor::KeyError error_code,
+                              media::MediaKeys::KeyError error_code,
                               int system_code) {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   key_error_cb_.Run(key_system, session_id, error_code, system_code);