Add PpapiDecryptor which wraps a CDM plugin.

webkit/media/crypto/proxy_decryptor.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/crypto/proxy_decryptor.h"
 
 #include "base/logging.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decryptor_client.h"
 #include "media/crypto/aes_decryptor.h"
 #include "webkit/media/crypto/key_systems.h"
 
 namespace webkit_media {
 
-ProxyDecryptor::ProxyDecryptor(media::DecryptorClient* client)
-    : client_(client) {
+ProxyDecryptor::ProxyDecryptor(media::DecryptorClient* client,
+                               const CreatePluginCB& create_plugin_cb)
+    : client_(client),
+      create_plugin_cb_(create_plugin_cb) {
 }
 
 ProxyDecryptor::~ProxyDecryptor() {
 }
 
 void 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()
   // only creates a new decryptor when |decryptor_| is not initialized.
   if (!decryptor_.get()) {
     base::AutoLock auto_lock(lock_);
-    decryptor_ = CreateDecryptor(key_system, client_);
+    decryptor_ = CreateDecryptor(key_system, client_, create_plugin_cb_);

[ddorwin, 2012/07/17 21:31:28]

As mentioned in ppapi_decryptor.cc, I think we should separate initialization
from GKR.
One additional advantage is we can avoid storing this CB.
If we do it in a Create() or Init() method, we could pass in frame_, etc. to
that method and not need a create_plugin_cb, which is specific to one type of
Decryptor.

From there, we can try to solve this call. Maybe it creates the appropriate
object, and we call Init() with client and frame_and it does the right thing.

We have to pass some extra types around, but at least the pattern is the same
for all types and PluginInstance is not exposed. The only other option seems to
be moving creation to this class, which would separate the key string code or
require exposing "GetDecryptorTypeForKeySystem()".

[xhwang, 2012/07/18 19:43:17]

Done.

   }
 
   DCHECK(decryptor_.get());
   decryptor_->GenerateKeyRequest(key_system, init_data, init_data_length);
 }
 
 void ProxyDecryptor::AddKey(const std::string& key_system,
                             const uint8* key,
                             int key_length,
                             const uint8* init_data,
@@ skipping 21 matching lines @@
     base::AutoLock auto_lock(lock_);
     decryptor = decryptor_.get();
   }
   if (!decryptor)
     decrypt_cb.Run(kError, NULL);
 
   return decryptor->Decrypt(encrypted, decrypt_cb);
 }
 
 }  // namespace webkit_media