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

webkit/media/crypto/ppapi/clear_key_cdm.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/ppapi/clear_key_cdm.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 171 matching lines @@
   channel_count_ = 0;
   bits_per_channel_ = 0;
   samples_per_second_ = 0;
   last_timestamp_ = media::kNoTimestamp();
   last_duration_ = media::kInfiniteDuration();
 #endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 }
 
 ClearKeyCdm::~ClearKeyCdm() {}
 
-cdm::Status ClearKeyCdm::GenerateKeyRequest(const uint8_t* init_data,
+// TODO(tomfinegan): Use |mime_type| to determine type of |init_data|.

[ddorwin, 2012/10/26 18:37:06]

I think this TODO actually belongs in AesDecryptor. Maybe just move it to 201
and say we need to extend the Decryptor interface.

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

Done.

+cdm::Status ClearKeyCdm::GenerateKeyRequest(const char* /* mime_type */,
+                                            int /* mime_type_size */,
+                                            const uint8_t* init_data,
                                             int init_data_size,
                                             cdm::KeyMessage* key_request) {
   DVLOG(1) << "GenerateKeyRequest()";
   base::AutoLock auto_lock(client_lock_);
   ScopedResetter<Client> auto_resetter(&client_);
   decryptor_.GenerateKeyRequest("", init_data, init_data_size);
 
   if (client_.status() != Client::kKeyMessage)
     return cdm::kSessionError;
 
@@ skipping 334 matching lines @@
 
   static unsigned char color = 0;
   color += 10;
 
   memset(reinterpret_cast<void*>(video_frame->frame_buffer()->data()),
          color, frame_size);
 }
 #endif  // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
 
 }  // namespace webkit_media