Media Galleries API Metadata: SafeMediaMetadataParser and IPCTunnelDataReader.

chrome/utility/chrome_content_utility_client.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_UTILITY_CHROME_CONTENT_UTILITY_CLIENT_H_
 #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"
 #include "content/public/utility/content_utility_client.h"
 #include "ipc/ipc_platform_file.h"
 
 namespace base {
 class FilePath;
 struct FileDescriptor;
 }
 
 namespace gfx {
 class Rect;
 }
 
+namespace metadata {
+class IPCTunnelDataReader;
+class MediaMetadataParser;
+}
+
 namespace printing {
 class PdfRenderSettings;
 struct PageRange;
 }
 
 namespace chrome {
 
 class UtilityMessageHandler;
 
 class ChromeContentUtilityClient : public content::ContentUtilityClient {
@@ skipping 51 matching lines @@
       const printing::PdfRenderSettings& settings,
       base::PlatformFile bitmap_file);
 
   void OnGetPrinterCapsAndDefaults(const std::string& printer_name);
   void OnStartupPing();
   void OnAnalyzeZipFileForDownloadProtection(
       const IPC::PlatformFileForTransit& zip_file);
 #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)
   void OnParseITunesPrefXml(const std::string& itunes_xml_data);
 #endif  // defined(OS_WIN)
 
 #if defined(OS_MACOSX)
   void OnParseIPhotoLibraryXmlFile(
       const IPC::PlatformFileForTransit& iphoto_library_file);
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   void OnParseITunesLibraryXmlFile(
       const IPC::PlatformFileForTransit& itunes_library_file);
 
   void OnParsePicasaPMPDatabase(
       const picasa::AlbumTableFilesForTransit& album_table_files);
 
   void OnIndexPicasaAlbumsContents(
       const picasa::AlbumUIDSet& album_uids,
       const std::vector<picasa::FolderINIContents>& folders_inis);
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
   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);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_UTILITY_CHROME_CONTENT_UTILITY_CLIENT_H_