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"
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/test_data_util.h"
 #include "media/base/video_decoder_config.h"
 #include "media/mp4/mp4_stream_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::TimeDelta;
 
 namespace media {
 namespace mp4 {
 
+// TODO(xhwang): Figure out the init data type appropriately once it's spec'ed.
+static const char kMp4InitDataType[] = "video/mp4";
+
 class MP4StreamParserTest : public testing::Test {
  public:
   MP4StreamParserTest()
       : parser_(new MP4StreamParser(false)),
         configs_received_(false) {
   }
 
  protected:
   scoped_ptr<MP4StreamParser> parser_;
   base::TimeDelta segment_start_;
@@ skipping 11 matching lines @@
                                     static_cast<size_t>(end - start));
       if (!AppendData(start, append_size))
         return false;
       start += append_size;
     }
     return true;
   }
 
   void InitF(bool init_ok, base::TimeDelta duration) {
     DVLOG(1) << "InitF: ok=" << init_ok
-              << ", dur=" << duration.InMilliseconds();
+             << ", dur=" << duration.InMilliseconds();

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

nit: space replacement, but still off

[xhwang, 2012/10/27 05:32:52]

On my local linux bot this looks aligned (no tab). I am so confused. CQ anyway.

   }
 
   bool NewConfigF(const AudioDecoderConfig& ac, const VideoDecoderConfig& vc) {
     DVLOG(1) << "NewConfigF: audio=" << ac.IsValidConfig()
              << ", video=" << vc.IsValidConfig();
     configs_received_ = true;
     return true;
   }
 
   bool NewBuffersF(const StreamParser::BufferQueue& bufs) {
     DVLOG(2) << "NewBuffersF: " << bufs.size() << " buffers";
     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) {
+  bool KeyNeededF(const std::string& type,
+                  scoped_array<uint8> init_data, int init_data_size) {
     DVLOG(1) << "KeyNeededF: " << init_data_size;
+    EXPECT_EQ(kMp4InitDataType, type);
+    EXPECT_TRUE(init_data.get());
+    EXPECT_GT(init_data_size, 0);
     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