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

media/mojo/services/renderer_config_default.cc

 // Copyright 2014 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 "media/mojo/services/renderer_config.h"
 
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_output_stream_sink.h"
@@ skipping 23 matching lines @@
   void PaintFrameUsingOldRenderingPath(
       const scoped_refptr<VideoFrame>& frame) override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DummyVideoRendererSink);
 };
 
 class DefaultRendererConfig : public PlatformRendererConfig {
  public:
   DefaultRendererConfig() {
-    // TODO(dalecurtis): This will not work if the process is sandboxed...
-    if (!media::IsMediaLibraryInitialized()) {
-      base::FilePath module_dir;
-      CHECK(PathService::Get(base::DIR_EXE, &module_dir));
-      CHECK(media::InitializeMediaLibrary(module_dir));
-    }
+    InitializeMediaLibrary();
 
     // TODO(dalecurtis): We should find a single owner per process for the audio
     // manager or make it a lazy instance.  It's not safe to call Get()/Create()
     // across multiple threads...
     //
     // TODO(dalecurtis): Eventually we'll want something other than a fake audio
     // log factory here too.  We should probably at least DVLOG() such info.
     AudioManager* audio_manager = AudioManager::Get();
     if (!audio_manager)
       audio_manager = media::AudioManager::Create(&fake_audio_log_factory_);
@@ skipping 55 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(DefaultRendererConfig);
 };
 
 scoped_ptr<PlatformRendererConfig> CreatePlatformRendererConfig() {
   return make_scoped_ptr(new DefaultRendererConfig());
 }
 
 }  // namespace internal
 }  // namespace media