Rename WebSourceBuffer::abort -> resetParserState

media/test/pipeline_integration_test.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 480 matching lines @@
   scoped_ptr<Demuxer> GetDemuxer() { return owned_chunk_demuxer_.Pass(); }
 
   void set_encrypted_media_init_data_cb(
       const Demuxer::EncryptedMediaInitDataCB& encrypted_media_init_data_cb) {
     encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
   }
 
   void Seek(base::TimeDelta seek_time, int new_position, int seek_append_size) {
     chunk_demuxer_->StartWaitingForSeek(seek_time);
 
-    chunk_demuxer_->Abort(
+    chunk_demuxer_->ResetParserState(
         kSourceId,
         base::TimeDelta(), kInfiniteDuration(), &last_timestamp_offset_);
 
     DCHECK_GE(new_position, 0);
     DCHECK_LT(new_position, file_data_->data_size());
     current_position_ = new_position;
 
     AppendData(seek_append_size);
   }
 
@@ skipping 40 matching lines @@
                                &timestamp_offset,
                                base::Bind(&MockMediaSource::InitSegmentReceived,
                                           base::Unretained(this)));
     last_timestamp_offset_ = timestamp_offset;
   }
 
   void EndOfStream() {
     chunk_demuxer_->MarkEndOfStream(PIPELINE_OK);
   }
 
   void Abort() {

[wolenetz, 2015/09/09 18:20:42]

Hmm. This mock of the SourceBuffer API's Abort() does something different than
SourceBuffer::abort().
In the spirit of this CL cleaning up MSE "Abort" ambiguity, either change this
method name to something like "ShutdownChunkDemuxer", or (preferred somewhat),
keep it called "Abort", but change behavior in two ways:
1) Have it call chunk_demuxer_->ResetParserState(...) [I'm unsure if tests rely
also on post-MockMediaSource::Abort() |last_timestamp_offset_| not being reset,
but it would also be good to reset it to align with SourceBuffer::Abort() and
fix the tests if needed to match their original intent], and
2) override PipelineIntegrationTestBase::Stop() to: a) shutdown and reset to
nullptr chunk_demuxer_ if it wasn't previously nullptr, and b) then call the
base class's Stop().

WDYT?

     if (!chunk_demuxer_)
       return;
     chunk_demuxer_->Shutdown();
     chunk_demuxer_ = NULL;
   }
 
   void DemuxerOpened() {
     base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(&MockMediaSource::DemuxerOpenedTask,
                               base::Unretained(this)));
@@ skipping 1263 matching lines @@
 
 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
   ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
   Play();
   ASSERT_TRUE(WaitUntilOnEnded());
   ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
             demuxer_->GetStartTime());
 }
 
 }  // namespace media