Separate MediaKeys interface from Decryptor interface.

webkit/media/crypto/proxy_decryptor.cc

Index: webkit/media/crypto/proxy_decryptor.cc
diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc
index 3e445c418161a272e97b12ea570596ce4531e789..5005dc3d2a828635bc2afae830103f5de2d5ab6b 100644
--- a/webkit/media/crypto/proxy_decryptor.cc
+++ b/webkit/media/crypto/proxy_decryptor.cc
@@ -125,13 +125,13 @@ bool ProxyDecryptor::GenerateKeyRequest(const std::string& key_system,
     decryptor_ = CreateDecryptor(key_system);
     if (!decryptor_) {
       key_error_cb_.Run(
-          key_system, std::string(), media::Decryptor::kClientError, 0);
+          key_system, std::string(), media::MediaKeys::kClientError, 0);
       return false;
     }
   }
 
-  if (!decryptor_->GenerateKeyRequest(key_system, type,
-                                      init_data, init_data_length)) {
+  if (!decryptor_->GetMediaKeys()->GenerateKeyRequest(
+      key_system, type, init_data, init_data_length)) {
     decryptor_.reset();
     return false;
   }
@@ -151,8 +151,8 @@ void ProxyDecryptor::AddKey(const std::string& key_system,
   DVLOG(1) << "AddKey()";
 
   // WebMediaPlayerImpl ensures GenerateKeyRequest() has been called.
-  decryptor_->AddKey(key_system, key, key_length, init_data, init_data_length,
-                     session_id);
+  decryptor_->GetMediaKeys()->AddKey(
+      key_system, key, key_length, init_data, init_data_length, session_id);
 }
 
 void ProxyDecryptor::CancelKeyRequest(const std::string& key_system,
@@ -160,7 +160,7 @@ void ProxyDecryptor::CancelKeyRequest(const std::string& key_system,
   DVLOG(1) << "CancelKeyRequest()";
 
   // WebMediaPlayerImpl ensures GenerateKeyRequest() has been called.
-  decryptor_->CancelKeyRequest(key_system, session_id);
+  decryptor_->GetMediaKeys()->CancelKeyRequest(key_system, session_id);
 }
 
 #if defined(ENABLE_PEPPER_CDMS)
@@ -214,7 +214,7 @@ void ProxyDecryptor::KeyAdded(const std::string& key_system,
 
 void ProxyDecryptor::KeyError(const std::string& key_system,
                               const std::string& session_id,
-                              media::Decryptor::KeyError error_code,
+                              media::MediaKeys::KeyError error_code,
                               int system_code) {
   key_error_cb_.Run(key_system, session_id, error_code, system_code);
 }