Index: webkit/media/buffered_data_source_unittest.cc |
diff --git a/webkit/media/buffered_data_source_unittest.cc b/webkit/media/buffered_data_source_unittest.cc |
index 10d584c8db77a1481ec324badb098d106a73093a..6ef2fc3ef78c1d55951a6b613f234021655e8ceb 100644 |
--- a/webkit/media/buffered_data_source_unittest.cc |
+++ b/webkit/media/buffered_data_source_unittest.cc |
@@ -115,7 +115,7 @@ class BufferedDataSourceTest : public testing::Test { |
data_source_->Initialize( |
gurl, BufferedResourceLoader::kUnspecified, base::Bind( |
&BufferedDataSourceTest::OnInitialize, base::Unretained(this))); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
bool is_http = gurl.SchemeIs(kHttpScheme) || gurl.SchemeIs(kHttpsScheme); |
EXPECT_EQ(data_source_->downloading(), is_http); |
@@ -145,23 +145,23 @@ class BufferedDataSourceTest : public testing::Test { |
void Stop() { |
if (data_source_->loading()) { |
loader()->didFail(url_loader(), response_generator_->GenerateError()); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
} |
data_source_->Stop(media::NewExpectedClosure()); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
} |
void ExpectCreateResourceLoader() { |
EXPECT_CALL(*data_source_, CreateResourceLoader(_, _)) |
.WillOnce(Invoke(data_source_.get(), |
&MockBufferedDataSource::CreateMockResourceLoader)); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
} |
void Respond(const WebURLResponse& response) { |
loader()->didReceiveResponse(url_loader(), response); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
} |
void ReceiveData(int size) { |
@@ -169,13 +169,13 @@ class BufferedDataSourceTest : public testing::Test { |
memset(data.get(), 0xA5, size); // Arbitrary non-zero value. |
loader()->didReceiveData(url_loader(), data.get(), size, size); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
} |
void FinishLoading() { |
data_source_->set_loading(false); |
loader()->didFinishLoading(url_loader(), 0); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
} |
MOCK_METHOD1(ReadCallback, void(int size)); |
@@ -184,7 +184,7 @@ class BufferedDataSourceTest : public testing::Test { |
data_source_->Read(position, kDataSize, buffer_, |
base::Bind(&BufferedDataSourceTest::ReadCallback, |
base::Unretained(this))); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
} |
// Accessors for private variables on |data_source_|. |
@@ -333,7 +333,7 @@ TEST_F(BufferedDataSourceTest, Http_AbortWhileReading) { |
// Abort!!! |
EXPECT_CALL(*this, ReadCallback(media::DataSource::kReadError)); |
data_source_->Abort(); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
EXPECT_FALSE(data_source_->loading()); |
Stop(); |
@@ -348,7 +348,7 @@ TEST_F(BufferedDataSourceTest, File_AbortWhileReading) { |
// Abort!!! |
EXPECT_CALL(*this, ReadCallback(media::DataSource::kReadError)); |
data_source_->Abort(); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
EXPECT_FALSE(data_source_->loading()); |
Stop(); |
@@ -494,7 +494,7 @@ TEST_F(BufferedDataSourceTest, StopDoesNotUseMessageLoopForCallback) { |
// Verify that the callback was called inside the Stop() call. |
EXPECT_TRUE(stop_done_called); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
} |
TEST_F(BufferedDataSourceTest, DefaultValues) { |
@@ -517,7 +517,7 @@ TEST_F(BufferedDataSourceTest, SetBitrate) { |
InitializeWith206Response(); |
data_source_->SetBitrate(1234); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
EXPECT_EQ(1234, data_source_bitrate()); |
EXPECT_EQ(1234, loader_bitrate()); |
@@ -540,7 +540,7 @@ TEST_F(BufferedDataSourceTest, SetPlaybackRate) { |
InitializeWith206Response(); |
data_source_->SetPlaybackRate(2.0f); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
EXPECT_EQ(2.0f, data_source_playback_rate()); |
EXPECT_EQ(2.0f, loader_playback_rate()); |