Change NeedKeyCB to use std::vector.

media/mp4/mp4_stream_parser_unittest.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 <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
@@ skipping 76 matching lines @@
     DumpBuffers("video_buffers", video_buffers);
     return true;
   }
 
   bool NewTextBuffersF(TextTrack* text_track,
                        const StreamParser::BufferQueue& buffers) {
     return true;
   }
 
   void KeyNeededF(const std::string& type,
-                  scoped_ptr<uint8[]> init_data, int init_data_size) {
-    DVLOG(1) << "KeyNeededF: " << init_data_size;
+                  const std::vector<uint8>& init_data) {
+    DVLOG(1) << "KeyNeededF: " << init_data.size();
     EXPECT_EQ(kMp4InitDataType, type);
-    EXPECT_TRUE(init_data.get());
-    EXPECT_GT(init_data_size, 0);
+    EXPECT_TRUE(&init_data[0]);
+    EXPECT_GT(init_data.size(), 0u);

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

ditto

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

Done.

   }
 
   scoped_ptr<TextTrack> AddTextTrackF(
       TextKind kind,
       const std::string& label,
       const std::string& language) {
     return scoped_ptr<TextTrack>();
   }
 
   void NewSegmentF() {
@@ skipping 95 matching lines @@
   EXPECT_TRUE(AppendDataInPieces(buffer->data() + kFirstMoofOffset,
                                  buffer->data_size() - kFirstMoofOffset,
                                  512));
 }
 
 // TODO(strobe): Create and test media which uses CENC auxiliary info stored
 // inside a private box
 
 }  // namespace mp4
 }  // namespace media