Index: media/test/pipeline_integration_test.cc |
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc |
index 6ce35f04cecf74df3d6528a2d4ce64d0054decc8..ead238c8b7480454524e8a5c83c90e0ba6ccdb9e 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, |