Enable round-tripping and updating of WebSourceBufferImpl timestamp offset

media/filters/chunk_demuxer_unittest.cc

Index: media/filters/chunk_demuxer_unittest.cc
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc
index d2c410da9c02c7040b36b8490254b88b8b8cd447..2a3f417ce45ee3025776e812ca827236cda18380 100644
--- a/media/filters/chunk_demuxer_unittest.cc
+++ b/media/filters/chunk_demuxer_unittest.cc
@@ -391,10 +391,20 @@ class ChunkDemuxerTest : public testing::Test {
     AppendCluster(source_id, cb.Finish());
   }
 
+  void AppendDataExpectingNoTimestampOffsetUpdate(const std::string& source_id,
+                                                  const uint8* data,
+                                                  size_t length) {
+    // TODO(wolenetz): Test timestamp offset updating once "sequence" append
+    // mode processing is implemented. See http://crbug.com/249422.
+    base::TimeDelta dummy_new_timestamp_offset;
+    demuxer_->AppendData(source_id, data, length, &dummy_new_timestamp_offset);
+    EXPECT_EQ(kNoTimestamp(), dummy_new_timestamp_offset);
+  }
+
   void AppendData(const std::string& source_id,
                   const uint8* data, size_t length) {
     EXPECT_CALL(host_, AddBufferedTimeRange(_, _)).Times(AnyNumber());
-    demuxer_->AppendData(source_id, data, length);
+    AppendDataExpectingNoTimestampOffsetUpdate(source_id, data, length);
   }
 
   void AppendDataInPieces(const uint8* data, size_t length) {
@@ -1216,8 +1226,9 @@ TEST_F(ChunkDemuxerTest, AppendDataBeforeInit) {
   int info_tracks_size = 0;
   CreateInitSegment(HAS_AUDIO | HAS_VIDEO,
                     false, false, &info_tracks, &info_tracks_size);
-
-  demuxer_->AppendData(kSourceId, info_tracks.get(), info_tracks_size);
+  AppendDataExpectingNoTimestampOffsetUpdate(kSourceId,
+                                             info_tracks.get(),
+                                             info_tracks_size);
 }
 
 // Make sure Read() callbacks are dispatched with the proper data.
@@ -1250,7 +1261,9 @@ TEST_F(ChunkDemuxerTest, OutOfOrderClusters) {
 
   // Verify that AppendData() can still accept more data.
   scoped_ptr<Cluster> cluster_c(GenerateCluster(45, 2));
-  demuxer_->AppendData(kSourceId, cluster_c->data(), cluster_c->size());
+  AppendDataExpectingNoTimestampOffsetUpdate(kSourceId,
+                                             cluster_c->data(),
+                                             cluster_c->size());
 }
 
 TEST_F(ChunkDemuxerTest, NonMonotonicButAboveClusterTimecode) {
@@ -1272,7 +1285,9 @@ TEST_F(ChunkDemuxerTest, NonMonotonicButAboveClusterTimecode) {
 
   // Verify that AppendData() ignores data after the error.
   scoped_ptr<Cluster> cluster_b(GenerateCluster(20, 2));
-  demuxer_->AppendData(kSourceId, cluster_b->data(), cluster_b->size());
+  AppendDataExpectingNoTimestampOffsetUpdate(kSourceId,
+                                             cluster_b->data(),
+                                             cluster_b->size());
 }
 
 TEST_F(ChunkDemuxerTest, BackwardsAndBeforeClusterTimecode) {
@@ -1294,7 +1309,9 @@ TEST_F(ChunkDemuxerTest, BackwardsAndBeforeClusterTimecode) {
 
   // Verify that AppendData() ignores data after the error.
   scoped_ptr<Cluster> cluster_b(GenerateCluster(6, 2));
-  demuxer_->AppendData(kSourceId, cluster_b->data(), cluster_b->size());
+  AppendDataExpectingNoTimestampOffsetUpdate(kSourceId,
+                                             cluster_b->data(),
+                                             cluster_b->size());
 }
 
 
@@ -1751,7 +1768,7 @@ TEST_F(ChunkDemuxerTest, ParseErrorDuringInit) {
   ASSERT_EQ(AddId(), ChunkDemuxer::kOk);
 
   uint8 tmp = 0;
-  demuxer_->AppendData(kSourceId, &tmp, 1);
+  AppendDataExpectingNoTimestampOffsetUpdate(kSourceId, &tmp, 1);
 }
 
 TEST_F(ChunkDemuxerTest, AVHeadersWithAudioOnlyType) {