[Merge to M44] Chromium changes to statically link ffmpeg.

media/test/pipeline_integration_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
@@ skipping 613 matching lines @@
 };
 
 #if defined(MOJO_RENDERER)
 class PipelineIntegrationTestHost : public mojo::test::ApplicationTestBase,
                                     public PipelineIntegrationTestBase {
  public:
   bool ShouldCreateDefaultRunLoop() override { return false; }
 
   void SetUp() override {
     ApplicationTestBase::SetUp();
-    if (!IsMediaLibraryInitialized())
-      InitializeMediaLibraryForTesting();
+    InitializeMediaLibrary();
   }
 
  protected:
   scoped_ptr<Renderer> CreateRenderer() override {
     mojo::ServiceProvider* service_provider =
         application_impl()
             ->ConnectToApplication("mojo://media")
             ->GetServiceProvider();
 
     mojo::MediaRendererPtr mojo_media_renderer;
@@ skipping 1092 matching lines @@
 
 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
   ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
   Play();
   ASSERT_TRUE(WaitUntilOnEnded());
   ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
             demuxer_->GetStartTime());
 }
 
 }  // namespace media