Index: chrome/plugin/chrome_content_plugin_client.cc |
diff --git a/chrome/plugin/chrome_content_plugin_client.cc b/chrome/plugin/chrome_content_plugin_client.cc |
index c998b783c9328df8bb20cd595144421aa73b168f..3cfce2851cd9241ed5c571a73ebc60fc3d6ef6bb 100644 |
--- a/chrome/plugin/chrome_content_plugin_client.cc |
+++ b/chrome/plugin/chrome_content_plugin_client.cc |
@@ -43,8 +43,11 @@ void ChromeContentPluginClient::PreSandboxInitialization() { |
LOG(ERROR) << "Failed to load crypto32.dll: " << error.ToString(); |
#endif // defined(OS_WIN) |
- // Initialize media libraries for the Chromoting client plugin. |
- media::InitializeMediaLibrary(); |
+ // Load media libraries for the Chromoting client plugin. |
+ base::FilePath media_path; |
+ PathService::Get(content::DIR_MEDIA_LIBS, &media_path); |
+ if (!media_path.empty()) |
+ media::InitializeMediaLibrary(media_path); |
#endif // defined(ENABLE_REMOTING) |
} |