| Index: media/test/pipeline_integration_test.cc
|
| diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
|
| index ead238c8b7480454524e8a5c83c90e0ba6ccdb9e..6ce35f04cecf74df3d6528a2d4ce64d0054decc8 100644
|
| --- a/media/test/pipeline_integration_test.cc
|
| +++ b/media/test/pipeline_integration_test.cc
|
| @@ -631,12 +631,8 @@ class PipelineIntegrationTestHost : public mojo::test::ApplicationTestBase,
|
|
|
| void SetUp() override {
|
| ApplicationTestBase::SetUp();
|
| -
|
| - // TODO(dalecurtis): For some reason this isn't done...
|
| - if (!base::CommandLine::InitializedForCurrentProcess()) {
|
| - base::CommandLine::Init(0, NULL);
|
| + if (!IsMediaLibraryInitialized())
|
| InitializeMediaLibraryForTesting();
|
| - }
|
| }
|
|
|
| protected:
|
| @@ -681,8 +677,6 @@ 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,
|
| @@ -727,8 +721,6 @@ 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,
|
|
|