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..83a30508038a9fae37f23f719c0851fd77c5298b 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,11 @@ namespace gfx {
 class Rect;
 }
 
+namespace metadata {
+class IPCTunnelDataReader;
+class MediaMetadataParser;
+}
+
 namespace printing {
 class PdfRenderSettings;
 struct PageRange;
@@ -92,6 +98,9 @@ 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);
+  void OnParseMediaMetadataRequestBlobBytesFinished(int64 request_id,
+                                                    const std::string& bytes);
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 #if defined(OS_WIN)
@@ -118,6 +127,13 @@ 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_;
+
+  // Owned by |media_metadata_parser_|. A reference only.
+  metadata::IPCTunnelDataReader* ipc_tunnel_data_reader_;

[tommycli, 2013/12/04 01:30:38]

This is kind of janky. It's here because ChromeContentUtilityClient needs to
deliver some bytes over to the data reader and MediaMetadataParser takes
ownership of its data reader.

Maybe MediaMetadataParser should not take ownership and they can be siblings?

[tommycli, 2014/01/06 20:25:11]

Done.

+#endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
+
   DISALLOW_COPY_AND_ASSIGN(ChromeContentUtilityClient);
 };