EME v0.1: Report defaultURL in KeyMessage.

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 <algorithm>
 #include <sstream>
 #include <string>
 #include <vector>
@@ skipping 157 matching lines @@
   session_id_ = session_id;
 }
 
 void ClearKeyCdm::Client::KeyMessage(const std::string& key_system,
                                      const std::string& session_id,
                                      const std::string& message,
                                      const std::string& default_url) {
   status_ = kKeyMessage;
   session_id_ = session_id;
   key_message_ = message;
+  default_url_ = default_url;
 }
 
 void ClearKeyCdm::Client::NeedKey(const std::string& key_system,
                                   const std::string& session_id,
                                   const std::string& type,
                                   scoped_array<uint8> init_data,
                                   int init_data_length) {
   // In the current implementation of AesDecryptor, NeedKey is not used.
   // If no key is available to decrypt an input buffer, it returns kNoKey to
   // the caller instead of firing NeedKey.
@@ skipping 70 matching lines @@
 cdm::Status ClearKeyCdm::CancelKeyRequest(const char* session_id,
                                           int session_id_size) {
   DVLOG(1) << "CancelKeyRequest()";
   base::AutoLock auto_lock(client_lock_);
   ScopedResetter<Client> auto_resetter(&client_);
   decryptor_.CancelKeyRequest("", std::string(session_id, session_id_size));
   return cdm::kSuccess;
 }
 
 void ClearKeyCdm::TimerExpired(void* context) {
   std::string heartbeat_message =

[scherkus (not reviewing), 2012/12/14 21:45:26]

using ?: is great 'n all if it fits on one line, but this is 5 lines long

at this point I'd say just use an if

[ddorwin, 2012/12/14 21:55:16]

Done.

       (!next_heartbeat_message_.empty() &&
        context == &next_heartbeat_message_[0]) ?
           next_heartbeat_message_ :
           "ERROR: Invalid timer context found!";
 
+  // This URL is only used for testing the code path for defaultURL.
+  // There is no service at this URL, so applications should ignore it.
+  const char url[] = "http://test.externalclearkey.chromium.org";
+
   host_->SendKeyMessage(
       heartbeat_session_id_.data(), heartbeat_session_id_.size(),
       heartbeat_message.data(), heartbeat_message.size(),
-      NULL, 0);
+      url, arraysize(url) - 1);
 
   ScheduleNextHeartBeat();
 }
 
 static void CopyDecryptResults(
     media::Decryptor::Status* status_copy,
     scoped_refptr<media::DecoderBuffer>* buffer_copy,
     media::Decryptor::Status status,
     const scoped_refptr<media::DecoderBuffer>& buffer) {
   *status_copy = status;
@@ skipping 247 matching lines @@
   int samples_generated = GenerateFakeAudioFramesFromDuration(
       timestamp_in_microseconds - CurrentTimeStampInMicroseconds(),
       audio_frames);
   total_samples_generated_ += samples_generated;
 
   return samples_generated == 0 ? cdm::kNeedMoreData : cdm::kSuccess;
 }
 #endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 
 }  // namespace webkit_media