Chromium changes for static linking ffmpeg

chrome/utility/extensions/extensions_handler.cc

Index: chrome/utility/extensions/extensions_handler.cc
diff --git a/chrome/utility/extensions/extensions_handler.cc b/chrome/utility/extensions/extensions_handler.cc
index 982045ff9342790f5c76d8e82f99afd3c82b0e23..942545e1dbf2aefccb5ae25acd5d762657c64774 100644
--- a/chrome/utility/extensions/extensions_handler.cc
+++ b/chrome/utility/extensions/extensions_handler.cc
@@ -65,11 +65,8 @@ void ExtensionsHandler::PreSandboxStartup() {
   // Initialize libexif for image metadata parsing.
   metadata::ImageMetadataExtractor::InitializeLibrary();
 
-  // Load media libraries for media file validation.
-  base::FilePath media_path;
-  PathService::Get(content::DIR_MEDIA_LIBS, &media_path);
-  if (!media_path.empty())
-    media::InitializeMediaLibrary(media_path);
+  // Initialize media libraries for media file validation.

[DaleCurtis, 2015/06/02 18:21:06]

Doesn't really need to be pre-sandbox startup anymore; we should find a better
location for this, but it's fine for now.

[chcunningham, 2015/06/03 01:14:16]

SGTM. Filed https://code.google.com/p/chromium/issues/detail?id=495881

+  media::InitializeMediaLibrary();
 }
 
 bool ExtensionsHandler::OnMessageReceived(const IPC::Message& message) {