Media Galleries API Metadata: SafeMediaMetadataParser and IPCTunnelDataReader.

chrome/utility/chrome_content_utility_client.h

Index: chrome/utility/chrome_content_utility_client.h
diff --git a/chrome/utility/chrome_content_utility_client.h b/chrome/utility/chrome_content_utility_client.h
index e1b40f51209556a2781fc2c488fb3612479dc1f9..1cd8d2ebb1f193fe43b679db02ffa8043e0525b7 100644
--- a/chrome/utility/chrome_content_utility_client.h
+++ b/chrome/utility/chrome_content_utility_client.h
@@ -6,6 +6,7 @@
 #define CHROME_UTILITY_CHROME_CONTENT_UTILITY_CLIENT_H_
 
 #include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/platform_file.h"
 #include "chrome/common/media_galleries/picasa_types.h"
@@ -21,6 +22,10 @@ namespace gfx {
 class Rect;
 }
 
+namespace metadata {
+class MediaMetadataParser;
+}
+
 namespace printing {
 class PdfRenderSettings;
 struct PageRange;
@@ -92,6 +97,7 @@ class ChromeContentUtilityClient : public content::ContentUtilityClient {
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   void OnCheckMediaFile(int64 milliseconds_of_decoding,
                         const IPC::PlatformFileForTransit& media_file);
+  void OnParseMediaMetadata(const std::string& mime_type, int64 total_size);
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 #if defined(OS_WIN)
@@ -118,6 +124,10 @@ class ChromeContentUtilityClient : public content::ContentUtilityClient {
   typedef ScopedVector<UtilityMessageHandler> Handlers;
   Handlers handlers_;
 
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+  scoped_ptr<metadata::MediaMetadataParser> media_metadata_parser_;
+#endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
+
   DISALLOW_COPY_AND_ASSIGN(ChromeContentUtilityClient);
 };