Add a bool return value to media::Decryptor::GenerateKeyRequest().

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 203c1466fb78290b3d23f093f35c0f1f638ab712..530a446d6f94d2b3832c5e55baff6af165d30e2e 100644
--- a/webkit/media/crypto/proxy_decryptor.cc
+++ b/webkit/media/crypto/proxy_decryptor.cc
@@ -72,7 +72,7 @@ ProxyDecryptor::ProxyDecryptor(
 ProxyDecryptor::~ProxyDecryptor() {
 }
 
-void ProxyDecryptor::GenerateKeyRequest(const std::string& key_system,
+bool ProxyDecryptor::GenerateKeyRequest(const std::string& key_system,
                                         const uint8* init_data,
                                         int init_data_length) {
   // We do not support run-time switching of decryptors. GenerateKeyRequest()
@@ -85,10 +85,11 @@ void ProxyDecryptor::GenerateKeyRequest(const std::string& key_system,
 
   if (!decryptor_.get()) {
     client_->KeyError(key_system, "", media::Decryptor::kUnknownError, 0);
-    return;
+    return false;
   }
 
-  decryptor_->GenerateKeyRequest(key_system, init_data, init_data_length);
+  return decryptor_->GenerateKeyRequest(key_system,

[ddorwin, 2012/08/28 21:59:14]

For the meaning of the return value to be consistent (CDM is not established), I
think we need to destroy decryptor_ if this call fails. Otherwise, you could end
up with a plugin for one KS that can't be changed to another one with a future
GKR call.

+                                        init_data, init_data_length);
 }
 
 void ProxyDecryptor::AddKey(const std::string& key_system,
@@ -162,7 +163,7 @@ void ProxyDecryptor::Decrypt(
 }
 
 void ProxyDecryptor::Stop() {
-  DVLOG(1) << "AddKey()";
+  DVLOG(1) << "Stop()";
 
   std::vector<base::Closure> closures_to_run;
   {