summaryrefslogtreecommitdiffstats
path: root/media/test/pipeline_integration_test.cc
diff options
context:
space:
mode:
authorservolk <servolk@chromium.org>2015-09-10 18:29:04 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-11 01:29:53 +0000
commit0751b5f3fc75f72a438b7764ba5a59877b27fa84 (patch)
tree3ca411eaf054d9ea5fcf334c96c4a5a944a2a180 /media/test/pipeline_integration_test.cc
parentbb75fb72829076bc8fd1942d8fe0a9bc7a307d59 (diff)
downloadchromium_src-0751b5f3fc75f72a438b7764ba5a59877b27fa84.zip
chromium_src-0751b5f3fc75f72a438b7764ba5a59877b27fa84.tar.gz
chromium_src-0751b5f3fc75f72a438b7764ba5a59877b27fa84.tar.bz2
Rename WebSourceBuffer::abort -> resetParserState
As discussed in https://codereview.chromium.org/1013923002/, we could rename WebSourceBuffer::abort into WebSourceBuffer::resetParserState to avoid confusion that it's not the same thing as SourceBuffer::abort, and just one of the steps of the MSE abort algorithm. BUG=529497 Review URL: https://codereview.chromium.org/1312763014 Cr-Commit-Position: refs/heads/master@{#348308}
Diffstat (limited to 'media/test/pipeline_integration_test.cc')
-rw-r--r--media/test/pipeline_integration_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 28feb24..9f979ce 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -498,7 +498,7 @@ class MockMediaSource {
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_);
@@ -562,7 +562,7 @@ class MockMediaSource {
void Shutdown() {
if (!chunk_demuxer_)
return;
- chunk_demuxer_->Abort(
+ chunk_demuxer_->ResetParserState(
kSourceId,
base::TimeDelta(), kInfiniteDuration(), &last_timestamp_offset_);
chunk_demuxer_->Shutdown();