Add "type" in GenerateKeyRequest() and OnNeedKey().

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 58 matching lines @@
     for (StreamParser::BufferQueue::const_iterator buf = bufs.begin();
          buf != bufs.end(); buf++) {
       DVLOG(3) << "  n=" << buf - bufs.begin()
                << ", size=" << (*buf)->GetDataSize()
                << ", dur=" << (*buf)->GetDuration().InMilliseconds();
       EXPECT_GE((*buf)->GetTimestamp(), segment_start_);
     }
     return true;
   }
 
-  bool KeyNeededF(scoped_array<uint8> init_data, int init_data_size) {
-    DVLOG(1) << "KeyNeededF: " << init_data_size;
+  bool KeyNeededF(const std::string& type,
+                  scoped_array<uint8> init_data, int init_data_size) {
+    DVLOG(1) << "KeyNeededF: type=" << type

[ddorwin, 2012/10/27 00:08:26]

Shouldn't we just EXPECT_STREQ the type?

[xhwang, 2012/10/27 00:50:14]

Done.

+             << ", init_data_size=" << init_data_size;
     return true;
   }
 
   void NewSegmentF(TimeDelta start_dts) {
     DVLOG(1) << "NewSegmentF: " << start_dts.InMilliseconds();
     segment_start_ = start_dts;
   }
 
   void EndOfSegmentF() {
     DVLOG(1) << "EndOfSegmentF()";
@@ skipping 63 matching lines @@
   EXPECT_TRUE(AppendDataInPieces(buffer->GetData(),
                                  buffer->GetDataSize(),
                                  512));
 }
 
 // TODO(strobe): Create and test media which uses CENC auxiliary info stored
 // inside a private box
 
 }  // namespace mp4
 }  // namespace media