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

Unified Diff: media/filters/pipeline_integration_test.cc

Issue 10854151: Allow transitioning to HAVE_METADATA before pipeline initialization completes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
Index: media/filters/pipeline_integration_test.cc
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index aa53b1baf93da2d58239fc2aad51132e4d39a957..d6c9b5302553b762589c68e0a5d99e6aa07d23f6 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -188,7 +188,8 @@ class PipelineIntegrationTest
CreateFilterCollection(source, NULL),
base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)),
base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)),
- QuitOnStatusCB(PIPELINE_OK));
+ QuitOnStatusCB(PIPELINE_OK),
+ Pipeline::ReadyStateCB());
Ami GONE FROM CHROMIUM 2012/08/15 18:00:08 Any reason not to make these actually test that th
acolwell GONE FROM CHROMIUM 2012/08/15 23:21:15 Nope. Done
message_loop_.Run();
}
@@ -200,7 +201,8 @@ class PipelineIntegrationTest
CreateFilterCollection(source, encrypted_media->decryptor()),
base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)),
base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)),
- QuitOnStatusCB(PIPELINE_OK));
+ QuitOnStatusCB(PIPELINE_OK),
+ Pipeline::ReadyStateCB());
source->set_decryptor_client(encrypted_media);

Powered by Google App Engine
This is Rietveld 408576698