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 36 matching lines @@
   FilePath file_path;
   CHECK(PathService::Get(base::DIR_EXE, &file_path));
   CHECK(media::InitializeMediaLibrary(file_path));
   return true;
 }
 
 static bool g_cdm_module_initialized = InitializeFFmpegLibraries();
 #endif  // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
 
 static const char kClearKeyCdmVersion[] = "0.1.0.0";
+static const char kExternalClearKey[] = "org.chromium.externalclearkey";
 
 // Copies |input_buffer| into a media::DecoderBuffer. If the |input_buffer| is
 // empty, an empty (end-of-stream) media::DecoderBuffer is returned.
 static scoped_refptr<media::DecoderBuffer> CopyDecoderBufferFrom(
     const cdm::InputBuffer& input_buffer) {
   if (!input_buffer.data) {
     DCHECK_EQ(input_buffer.data_size, 0);
     return media::DecoderBuffer::CreateEOSBuffer();
   }
 
@@ skipping 42 matching lines @@
   return copy;
 }
 
 void INITIALIZE_CDM_MODULE() {
   av_register_all();
 }
 
 void DeInitializeCdmModule() {
 }
 
-cdm::ContentDecryptionModule* CreateCdmInstance(
-    cdm::Allocator* allocator, cdm::CdmHost* host) {
+cdm::ContentDecryptionModule* CreateCdmInstance(const char* key_system_arg,
+                                                int key_system_size,
+                                                cdm::Allocator* allocator,
+                                                cdm::CdmHost* host) {
   DVLOG(1) << "CreateCdmInstance()";
+  DCHECK_EQ(std::string(key_system_arg, key_system_size), kExternalClearKey);
   return new webkit_media::ClearKeyCdm(allocator, host);
 }
 
 void DestroyCdmInstance(cdm::ContentDecryptionModule* instance) {
   DVLOG(1) << "DestroyCdmInstance()";
   delete instance;
 }
 
 const char* GetCdmVersion() {
   return kClearKeyCdmVersion;
@@ skipping 57 matching lines @@
   channel_count_ = 0;
   bits_per_channel_ = 0;
   samples_per_second_ = 0;
   output_timestamp_base_in_microseconds_ = kNoTimestamp;
   total_samples_generated_ = 0;
 #endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 }
 
 ClearKeyCdm::~ClearKeyCdm() {}
 
-cdm::Status ClearKeyCdm::GenerateKeyRequest(const uint8_t* init_data,
+cdm::Status ClearKeyCdm::GenerateKeyRequest(const char* type, int 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_);
-  // TODO(tomfinegan): Pass "type" here once ContentDecryptionModule is updated.
-  decryptor_.GenerateKeyRequest("", "", init_data, init_data_size);
+  decryptor_.GenerateKeyRequest(kExternalClearKey,
+                                std::string(type, type_size),
+                                init_data, init_data_size);
 
   if (client_.status() != Client::kKeyMessage)
     return cdm::kSessionError;
 
   DCHECK(key_request);
   key_request->set_session_id(client_.session_id().data(),
                               client_.session_id().size());
 
   // TODO(tomfinegan): Get rid of this copy.
   key_request->set_message(allocator_->Allocate(client_.key_message_length()));
@@ skipping 338 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