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

content/test/content_test_suite.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 "content/test/content_test_suite.h"
 
 #if defined(OS_ANDROID)
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
 #include <map>
@@ skipping 104 matching lines @@
   gfx::InitDeviceScaleFactor(1.0f);
 #endif
 
   ContentTestSuiteBase::Initialize();
   {
     ContentClient client;
     ContentTestSuiteBase::RegisterContentSchemes(&client);
   }
   RegisterPathProvider();
 #if !defined(OS_IOS)
-  media::InitializeMediaLibraryForTesting();
+  media::InitializeMediaLibrary();
   // When running in a child process for Mac sandbox tests, the sandbox exists
   // to initialize GL, so don't do it here.
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kTestChildProcess)) {
     gfx::GLSurface::InitializeOneOffForTests();
     gpu::ApplyGpuDriverBugWorkarounds(base::CommandLine::ForCurrentProcess());
   }
 #endif
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestInitializationListener);
 #if defined(OS_ANDROID)
   SurfaceTextureManager::InitInstance(new TestSurfaceTextureManager);
 #endif
 }
 
 }  // namespace content