Index: media/filters/fake_video_decoder_unittest.cc |
diff --git a/media/filters/fake_video_decoder_unittest.cc b/media/filters/fake_video_decoder_unittest.cc |
index 2772b54ffbfc30f9e65342907238962575e7e131..3598a7a48edac090354d791401f048bfbd067d40 100644 |
--- a/media/filters/fake_video_decoder_unittest.cc |
+++ b/media/filters/fake_video_decoder_unittest.cc |
@@ -39,7 +39,7 @@ class FakeVideoDecoderTest |
is_reset_pending_(false) {} |
virtual ~FakeVideoDecoderTest() { |
- Stop(); |
+ Destroy(); |
} |
void InitializeWithConfig(const VideoDecoderConfig& config) { |
@@ -197,8 +197,8 @@ class FakeVideoDecoderTest |
ExpectResetResult(OK); |
} |
- void Stop() { |
- decoder_->Stop(); |
+ void Destroy() { |
+ decoder_.reset(); |
message_loop_.RunUntilIdle(); |
// All pending callbacks must have been fired. |
@@ -365,35 +365,35 @@ TEST_P(FakeVideoDecoderTest, Reset_PendingDuringPendingRead) { |
SatisfyReset(); |
} |
-TEST_P(FakeVideoDecoderTest, Stop) { |
+TEST_P(FakeVideoDecoderTest, Destroy) { |
Initialize(); |
ReadOneFrame(); |
ExpectReadResult(OK); |
- Stop(); |
+ Destroy(); |
} |
-TEST_P(FakeVideoDecoderTest, Stop_DuringPendingInitialization) { |
+TEST_P(FakeVideoDecoderTest, Destroy_DuringPendingInitialization) { |
EnterPendingInitState(); |
- Stop(); |
+ Destroy(); |
} |
-TEST_P(FakeVideoDecoderTest, Stop_DuringPendingRead) { |
+TEST_P(FakeVideoDecoderTest, Destroy_DuringPendingRead) { |
Initialize(); |
EnterPendingReadState(); |
- Stop(); |
+ Destroy(); |
} |
-TEST_P(FakeVideoDecoderTest, Stop_DuringPendingReset) { |
+TEST_P(FakeVideoDecoderTest, Destroy_DuringPendingReset) { |
Initialize(); |
EnterPendingResetState(); |
- Stop(); |
+ Destroy(); |
} |
-TEST_P(FakeVideoDecoderTest, Stop_DuringPendingReadAndPendingReset) { |
+TEST_P(FakeVideoDecoderTest, Destroy_DuringPendingReadAndPendingReset) { |
Initialize(); |
EnterPendingReadState(); |
EnterPendingResetState(); |
- Stop(); |
+ Destroy(); |
} |
} // namespace media |