summaryrefslogtreecommitdiffstats
path: root/media/test/pipeline_integration_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'media/test/pipeline_integration_test.cc')
-rw-r--r--media/test/pipeline_integration_test.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 6ce35f0..ead238c 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -631,8 +631,12 @@ class PipelineIntegrationTestHost : public mojo::test::ApplicationTestBase,
void SetUp() override {
ApplicationTestBase::SetUp();
- if (!IsMediaLibraryInitialized())
+
+ // TODO(dalecurtis): For some reason this isn't done...
+ if (!base::CommandLine::InitializedForCurrentProcess()) {
+ base::CommandLine::Init(0, NULL);
InitializeMediaLibraryForTesting();
+ }
}
protected:
@@ -677,6 +681,8 @@ class PipelineIntegrationTest : public PipelineIntegrationTestHost {
base::Unretained(this)),
base::Bind(&PipelineIntegrationTest::OnBufferingStateChanged,
base::Unretained(this)),
+ base::Bind(&PipelineIntegrationTest::OnVideoFramePaint,
+ base::Unretained(this)),
base::Closure(), base::Bind(&PipelineIntegrationTest::OnAddTextTrack,
base::Unretained(this)),
base::Bind(&PipelineIntegrationTest::OnWaitingForDecryptionKey,
@@ -721,6 +727,8 @@ class PipelineIntegrationTest : public PipelineIntegrationTestHost {
base::Unretained(this)),
base::Bind(&PipelineIntegrationTest::OnBufferingStateChanged,
base::Unretained(this)),
+ base::Bind(&PipelineIntegrationTest::OnVideoFramePaint,
+ base::Unretained(this)),
base::Closure(), base::Bind(&PipelineIntegrationTest::OnAddTextTrack,
base::Unretained(this)),
base::Bind(&PipelineIntegrationTest::OnWaitingForDecryptionKey,