Media Galleries API Metadata: SafeMediaMetadataParser and IPCTunnelDataReader.

chrome/utility/media_galleries/media_metadata_parser.h

Index: chrome/utility/media_galleries/media_metadata_parser.h
diff --git a/chrome/utility/media_galleries/media_metadata_parser.h b/chrome/utility/media_galleries/media_metadata_parser.h
index 5a0573aa504c499d21cc98cf6dcf5d743120a67e..3093b4b1df917f9fcc8dfa973e08796a0e56b28e 100644
--- a/chrome/utility/media_galleries/media_metadata_parser.h
+++ b/chrome/utility/media_galleries/media_metadata_parser.h
@@ -9,19 +9,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/extensions/api/media_galleries.h"
 
-namespace metadata {
-
-// This interface provides bytes needed by MediaMetadataParser.
-class DataReader {
- public:
-  typedef base::Callback<void(const std::string& bytes)> ReadBytesCallback;
+namespace media {
+class DataSource;
+}
 
-  virtual ~DataReader() {}
-
-  // Called on the utility thread.
-  virtual void ReadBytes(int64 offset, int64 length,
-                         const ReadBytesCallback& callback) = 0;
-};
+namespace metadata {
 
 // This class takes a MIME type and data source and parses its metadata. It
 // handles audio, video, and images. It delegates its operations to FFMPEG,
@@ -33,10 +25,9 @@ class MediaMetadataParser {
   typedef extensions::api::media_galleries::MediaMetadata MediaMetadata;
   typedef base::Callback<void(scoped_ptr<MediaMetadata>)> MetadataCallback;
 
-  // Takes ownership of |reader|. The MIME type is always sniffed in the browser
-  // process, as it's faster (and safe enough) to sniff it there. When the user
-  // wants more metadata than just the MIME type, this class provides it.
-  MediaMetadataParser(DataReader* reader, const std::string& mime_type);
+  // Does not take ownership of |source|. Caller is responsible for ensuring
+  // that |source| outlives this object.
+  MediaMetadataParser(media::DataSource* source, const std::string& mime_type);
 
   ~MediaMetadataParser();
 
@@ -44,7 +35,7 @@ class MediaMetadataParser {
   void Start(const MetadataCallback& callback);
 
  private:
-  scoped_ptr<DataReader> reader_;
+  media::DataSource* source_;
 
   MetadataCallback callback_;