Change NeedKeyCB to use std::vector.

content/renderer/media/webmediaplayer_impl.cc

 // Copyright 2013 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 "content/renderer/media/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 905 matching lines @@
 
 void WebMediaPlayerImpl::OnKeyAdded(const std::string& session_id) {
   DCHECK(main_loop_->BelongsToCurrentThread());
   EmeUMAHistogramCounts(current_key_system_, "KeyAdded", 1);
   GetClient()->keyAdded(current_key_system_,
                         WebString::fromUTF8(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.
   if (!decryptor_)
     return;
 
   UMA_HISTOGRAM_COUNTS(kMediaEme + std::string("NeedKey"), 1);
 
   DCHECK(init_data_type_.empty() || type.empty() || type == init_data_type_);
   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>
 WebMediaPlayerImpl::OnTextTrack(media::TextKind kind,
                                 const std::string& label,
                                 const std::string& language) {
   typedef WebInbandTextTrackImpl::Kind webkind_t;
   const webkind_t webkind = static_cast<webkind_t>(kind);
   const WebKit::WebString weblabel = WebKit::WebString::fromUTF8(label);
   const WebKit::WebString weblanguage = WebKit::WebString::fromUTF8(language);
@@ skipping 283 matching lines @@
 
   if (pending_repaint_)
     return;
 
   pending_repaint_ = true;
   main_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerImpl::Repaint, AsWeakPtr()));
 }
 
 }  // namespace content