Add media file validation to utility process

chrome/utility/chrome_content_utility_client.cc

Index: chrome/utility/chrome_content_utility_client.cc
diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
index 7b1eccae401d16bdbf2b292156ec83037c8ff4f3..41714dac550cc1b4cda98e5c46509c0f3fa63b84 100644
--- a/chrome/utility/chrome_content_utility_client.cc
+++ b/chrome/utility/chrome_content_utility_client.cc
@@ -7,9 +7,11 @@
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/time/time.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/chrome_manifest_handlers.h"
 #include "chrome/common/extensions/extension.h"
@@ -23,6 +25,8 @@
 #include "chrome/utility/web_resource_unpacker.h"
 #include "content/public/child/image_decoder_utils.h"
 #include "content/public/utility/utility_thread.h"
+#include "media/base/media.h"
+#include "media/base/media_file_checker.h"
 #include "printing/page_range.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/zlib/google/zip.h"
@@ -123,6 +127,7 @@ bool ChromeContentUtilityClient::OnMessageReceived(
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_StartupPing, OnStartupPing)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_AnalyzeZipFileForDownloadProtection,
                         OnAnalyzeZipFileForDownloadProtection)
+    IPC_MESSAGE_HANDLER(ChromeUtilityMsg_CheckMediaFile, OnCheckMediaFile)
 
 #if defined(OS_CHROMEOS)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_CreateZipFile, OnCreateZipFile)
@@ -151,10 +156,16 @@ bool ChromeContentUtilityClient::OnMessageReceived(
   return handled;
 }
 
-void ChromeContentUtilityClient::PreSandboxStartup() {
+// static
+void ChromeContentUtilityClient::PreSandboxStartup(
+    const base::FilePath& media_path) {
 #if defined(ENABLE_MDNS)
   local_discovery::ServiceDiscoveryMessageHandler::PreSandboxStartup();
 #endif  // ENABLE_MDNS
+
+  // Load media libraries for media file validation.
+  if (!media_path.empty())
+    media::InitializeMediaLibrary(media_path);
 }
 
 void ChromeContentUtilityClient::OnUnpackExtension(
@@ -514,6 +525,20 @@ void ChromeContentUtilityClient::OnAnalyzeZipFileForDownloadProtection(
   ReleaseProcessIfNeeded();
 }
 
+void ChromeContentUtilityClient::OnCheckMediaFile(
+    int64 milliseconds_of_decoding,
+    IPC::PlatformFileForTransit media_file) {
+  bool check_success = false;
+#if !defined(OS_ANDROID)
+  media::MediaFileChecker
+      checker(IPC::PlatformFileForTransitToPlatformFile(media_file));
+  check_success = checker.Start(
+      base::TimeDelta::FromMilliseconds(milliseconds_of_decoding));
+#endif  // !defined(OS_ANDROID)
+  Send(new ChromeUtilityHostMsg_CheckMediaFile_Finished(check_success));
+  ReleaseProcessIfNeeded();
+}
+
 #if defined(OS_WIN)
 void ChromeContentUtilityClient::OnParseITunesPrefXml(
     const std::string& itunes_xml_data) {