Change NeedKeyCB to use std::vector.

media/filters/chunk_demuxer_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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 139 matching lines @@
     return GenerateCluster(46, 66, 5);
   }
 
   ChunkDemuxerTest() {
     CreateNewDemuxer();
   }
 
   void CreateNewDemuxer() {
     base::Closure open_cb =
         base::Bind(&ChunkDemuxerTest::DemuxerOpened, base::Unretained(this));
-    ChunkDemuxer::NeedKeyCB need_key_cb =
+    Demuxer::NeedKeyCB need_key_cb =
         base::Bind(&ChunkDemuxerTest::DemuxerNeedKey, base::Unretained(this));
     AddTextTrackCB add_text_track_cb =
         base::Bind(&ChunkDemuxerTest::OnTextTrack, base::Unretained(this));
     demuxer_.reset(new ChunkDemuxer(open_cb, need_key_cb,
                                     add_text_track_cb, LogCB()));
   }
 
   virtual ~ChunkDemuxerTest() {
     ShutdownDemuxer();
   }
@@ skipping 678 matching lines @@
   }
 
   MOCK_METHOD0(DemuxerOpened, void());
   // TODO(xhwang): This is a workaround of the issue that move-only parameters
   // are not supported in mocked methods. Remove this when the issue is fixed
   // (http://code.google.com/p/googletest/issues/detail?id=395) or when we use
   // std::string instead of scoped_ptr<uint8[]> (http://crbug.com/130689).
   MOCK_METHOD3(NeedKeyMock, void(const std::string& type,
                                  const uint8* init_data, int init_data_size));
   void DemuxerNeedKey(const std::string& type,
-                      scoped_ptr<uint8[]> init_data, int init_data_size) {
-    NeedKeyMock(type, init_data.get(), init_data_size);
+                      const std::vector<uint8>& init_data) {
+    NeedKeyMock(type, &init_data[0], init_data.size());

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

ditto

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

Done.

   }
 
   scoped_ptr<TextTrack> OnTextTrack(TextKind kind,
                                     const std::string& label,
                                     const std::string& language) {
     return scoped_ptr<TextTrack>();
   }
 
   void Seek(base::TimeDelta seek_time) {
     demuxer_->StartWaitingForSeek(seek_time);
@@ skipping 1735 matching lines @@
 
 TEST_F(ChunkDemuxerTest, StartWaitingForSeekAfterParseError) {
   ASSERT_TRUE(InitDemuxer(true, true));
   EXPECT_CALL(host_, OnDemuxerError(PIPELINE_ERROR_DECODE));
   AppendGarbage();
   base::TimeDelta seek_time = base::TimeDelta::FromSeconds(50);
   demuxer_->StartWaitingForSeek(seek_time);
 }
 
 }  // namespace media