Change NeedKeyCB to use std::vector.

content/renderer/media/android/webmediaplayer_android.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/android/webmediaplayer_android.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 1113 matching lines @@
                       destination_url_gurl);
 }
 
 void WebMediaPlayerAndroid::OnMediaSourceOpened(
     WebKit::WebMediaSourceNew* web_media_source) {
   client_->mediaSourceOpened(web_media_source);
 }
 
 void WebMediaPlayerAndroid::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) {
   // Do not fire NeedKey event if encrypted media is not enabled.
   if (!WebKit::WebRuntimeFeatures::isEncryptedMediaEnabled() &&
       !WebKit::WebRuntimeFeatures::isLegacyEncryptedMediaEnabled()) {
     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;
 
   client_->keyNeeded(WebString(),
                      WebString::fromUTF8(session_id),
-                     init_data.get(),
-                     init_data_size);
+                     &init_data[0],

[xhwang, 2013/08/23 17:24:37]

Is it possible that init_data.empty()? It'll crash if yes. We wither need to 

DCHECK(!init_data.empty())

 or use 

init_data.empty() ? NULL : &init_data[0]

here

[acolwell GONE FROM CHROMIUM, 2013/08/23 19:55:28]

Done.

+                     init_data.size());
 }
 
 #if defined(GOOGLE_TV)
 bool WebMediaPlayerAndroid::InjectMediaStream(
     MediaStreamClient* media_stream_client,
     media::Demuxer* demuxer,
     const base::Closure& destroy_demuxer_cb) {
   DCHECK(!demuxer);
   media_stream_client_ = media_stream_client;
   demuxer_ = demuxer;
@@ skipping 18 matching lines @@
 
 void WebMediaPlayerAndroid::exitFullscreen() {
   proxy_->ExitFullscreen(player_id_);
 }
 
 bool WebMediaPlayerAndroid::canEnterFullscreen() const {
   return manager_->CanEnterFullscreen(frame_);
 }
 
 }  // namespace content