Index: content/renderer/media/webmediaplayer_impl.cc |
diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc |
index c651764cf816ad9de1e2fefefe5319564b7dc0be..b6d8a8b855c626ee736db5f9b83d7356eb96c448 100644 |
--- a/content/renderer/media/webmediaplayer_impl.cc |
+++ b/content/renderer/media/webmediaplayer_impl.cc |
@@ -923,8 +923,7 @@ void WebMediaPlayerImpl::OnKeyAdded(const std::string& session_id) { |
void WebMediaPlayerImpl::OnNeedKey(const std::string& session_id, |
const std::string& type, |
- scoped_ptr<uint8[]> init_data, |
- int init_data_size) { |
+ const std::vector<uint8>& init_data) { |
DCHECK(main_loop_->BelongsToCurrentThread()); |
// Do not fire NeedKey event if encrypted media is not enabled. |
@@ -937,10 +936,11 @@ void WebMediaPlayerImpl::OnNeedKey(const std::string& session_id, |
if (init_data_type_.empty()) |
init_data_type_ = type; |
+ const uint8* init_data_ptr = init_data.empty() ? NULL : &init_data[0]; |
GetClient()->keyNeeded(WebString(), |
WebString::fromUTF8(session_id), |
- init_data.get(), |
- init_data_size); |
+ init_data_ptr, |
+ init_data.size()); |
} |
scoped_ptr<media::TextTrack> |