Media Galleries API: Audio/Video attached pictures support.

chrome/browser/media_galleries/fileapi/safe_media_metadata_parser.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/media_galleries/fileapi/safe_media_metadata_parser.h"
 
 #include "chrome/browser/extensions/blob_reader.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/utility_process_host.h"
 
 using content::BrowserThread;
 
 namespace metadata {
 
-SafeMediaMetadataParser::SafeMediaMetadataParser(Profile* profile,
-                                                 const std::string& blob_uuid,
-                                                 int64 blob_size,
-                                                 const std::string& mime_type)
+SafeMediaMetadataParser::SafeMediaMetadataParser(
+    Profile* profile, const std::string& blob_uuid, int64 blob_size,
+    const std::string& mime_type, bool get_attached_pictures)
     : profile_(profile),
       blob_uuid_(blob_uuid),
       blob_size_(blob_size),
       mime_type_(mime_type),
+      get_attached_pictures_(get_attached_pictures),
       parser_state_(INITIAL_STATE) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 void SafeMediaMetadataParser::Start(const DoneCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&SafeMediaMetadataParser::StartWorkOnIOThread, this,
                  callback));
 }
 
 SafeMediaMetadataParser::~SafeMediaMetadataParser() {
 }
 
 void SafeMediaMetadataParser::StartWorkOnIOThread(
     const DoneCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK_EQ(INITIAL_STATE, parser_state_);
   DCHECK(!callback.is_null());
 
   callback_ = callback;
 
   utility_process_host_ = content::UtilityProcessHost::Create(
       this, base::MessageLoopProxy::current())->AsWeakPtr();
 
   utility_process_host_->Send(
-      new ChromeUtilityMsg_ParseMediaMetadata(mime_type_, blob_size_));
+      new ChromeUtilityMsg_ParseMediaMetadata(mime_type_, blob_size_,
+                                              get_attached_pictures_));
 
   parser_state_ = STARTED_PARSING_STATE;
 }
 
 void SafeMediaMetadataParser::OnParseMediaMetadataFinished(
-    bool parse_success, const base::DictionaryValue& metadata_dictionary) {
+    bool parse_success, const base::DictionaryValue& metadata_dictionary,
+    const std::vector<std::string>& attached_pictures_bytes,
+    const std::vector<std::string>& attached_pictures_types) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!callback_.is_null());
 
   if (parser_state_ != STARTED_PARSING_STATE)
     return;
 
+  if (attached_pictures_bytes.size() != attached_pictures_types.size()) {

[vandebo (ex-Chrome), 2014/04/23 23:22:45]

nit: no {}  Should this be a DCHECK ?

[tommycli, 2014/04/29 00:15:51]

Done. Moving to a struct eliminated the need for this check.

+    DLOG(ERROR) << "Media metadata parser gave malformed attached picture data";
+  }
+
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(callback_, parse_success,
-                 base::Owned(metadata_dictionary.DeepCopy())));
+                 base::Owned(metadata_dictionary.DeepCopy()),
+                 attached_pictures_bytes, attached_pictures_types));
   parser_state_ = FINISHED_PARSING_STATE;
 }
 
 void SafeMediaMetadataParser::OnUtilityProcessRequestBlobBytes(
     int64 request_id, int64 byte_start, int64 length) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&SafeMediaMetadataParser::StartBlobReaderOnUIThread, this,
@@ skipping 31 matching lines @@
       request_id, *data));
 }
 
 void SafeMediaMetadataParser::OnProcessCrashed(int exit_code) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!callback_.is_null());
 
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
-      base::Bind(callback_, false, base::Owned(new base::DictionaryValue)));
+      base::Bind(callback_, false, base::Owned(new base::DictionaryValue),
+                 std::vector<std::string>(), std::vector<std::string>()));
   parser_state_ = FINISHED_PARSING_STATE;
 }
 
 bool SafeMediaMetadataParser::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SafeMediaMetadataParser, message)
     IPC_MESSAGE_HANDLER(
         ChromeUtilityHostMsg_ParseMediaMetadata_Finished,
         OnParseMediaMetadataFinished)
     IPC_MESSAGE_HANDLER(
         ChromeUtilityHostMsg_RequestBlobBytes,
         OnUtilityProcessRequestBlobBytes)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 }  // namespace metadata