Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(405)

Unified Diff: media/filters/video_renderer_base_unittest.cc

Issue 6969026: Convert Filter::Seek() to use new callback system. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More CR fixes Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/video_renderer_base.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/video_renderer_base_unittest.cc
diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc
index c21d6c7933b7baba36341f1e68d81f843127281c..8a8c3488f3fb9260c6b537d78bee47205cf2f445 100644
--- a/media/filters/video_renderer_base_unittest.cc
+++ b/media/filters/video_renderer_base_unittest.cc
@@ -2,6 +2,7 @@
// 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/stl_util-inl.h"
#include "media/base/callback.h"
#include "media/base/data_buffer.h"
@@ -110,13 +111,15 @@ class VideoRendererBaseTest : public ::testing::Test {
Seek(0);
}
- void StartSeeking(int64 timestamp) {
+ void StartSeeking(int64 timestamp, PipelineStatus expected_status) {
EXPECT_FALSE(seeking_);
// Seek to trigger prerolling.
seeking_ = true;
renderer_->Seek(base::TimeDelta::FromMicroseconds(timestamp),
- NewCallback(this, &VideoRendererBaseTest::OnSeekComplete));
+ base::Bind(&VideoRendererBaseTest::OnSeekComplete,
+ base::Unretained(this),
+ expected_status));
}
void FinishSeeking() {
@@ -132,7 +135,7 @@ class VideoRendererBaseTest : public ::testing::Test {
}
void Seek(int64 timestamp) {
- StartSeeking(timestamp);
+ StartSeeking(timestamp, PIPELINE_OK);
FinishSeeking();
}
@@ -191,7 +194,8 @@ class VideoRendererBaseTest : public ::testing::Test {
read_queue_.push_back(frame);
}
- void OnSeekComplete() {
+ void OnSeekComplete(PipelineStatus expected_status, PipelineStatus status) {
+ EXPECT_EQ(status, expected_status);
EXPECT_TRUE(seeking_);
seeking_ = false;
}
@@ -269,9 +273,7 @@ TEST_F(VideoRendererBaseTest, Error_Playing) {
TEST_F(VideoRendererBaseTest, Error_Seeking) {
Initialize();
Flush();
- StartSeeking(0);
-
- EXPECT_CALL(host_, SetError(PIPELINE_ERROR_DECODE));
+ StartSeeking(0, PIPELINE_ERROR_DECODE);
CreateError();
Flush();
}
« no previous file with comments | « media/filters/video_renderer_base.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698