Media Galleries API Metadata: SafeMediaMetadataParser and IPCTunnelDataReader.

chrome/utility/chrome_content_utility_client.cc

 // 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.
 
 #include "chrome/utility/chrome_content_utility_client.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/scoped_native_library.h"
 #include "base/time/time.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/chrome_extensions_client.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/update_manifest.h"
 #include "chrome/common/safe_browsing/zip_analyzer.h"
 #include "chrome/utility/cloud_print/bitmap_image.h"
@@ skipping 29 matching lines @@
 #include "chrome/utility/media_galleries/iphoto_library_parser.h"
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
 #include "chrome/utility/media_galleries/iapps_xml_utils.h"
 #include "chrome/utility/media_galleries/itunes_library_parser.h"
 #include "chrome/utility/media_galleries/picasa_album_table_reader.h"
 #include "chrome/utility/media_galleries/picasa_albums_indexer.h"
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#include "chrome/utility/media_galleries/ipc_tunnel_data_source.h"
+#include "chrome/utility/media_galleries/media_metadata_parser.h"
+#endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
+
 #if defined(ENABLE_FULL_PRINTING)
 #include "chrome/common/crash_keys.h"
 #include "printing/backend/print_backend.h"
 #endif
 
 #if defined(ENABLE_MDNS)
 #include "chrome/utility/local_discovery/service_discovery_message_handler.h"
 #include "content/public/common/content_switches.h"
 #endif  // ENABLE_MDNS
 
@@ skipping 208 matching lines @@
   RenderPDFPageToDCProc render_pdf_to_dc_func_;
 
   DISALLOW_COPY_AND_ASSIGN(PdfFunctionsWin);
 };
 
 typedef PdfFunctionsWin PdfFunctions;
 #else  // OS_WIN
 typedef PdfFunctionsBase PdfFunctions;
 #endif  // OS_WIN
 
+void SendMediaMetadataToHost(
+    scoped_ptr<extensions::api::media_galleries::MediaMetadata> metadata) {
+  Send(new ChromeUtilityHostMsg_ParseMediaMetadata_Finished(
+      true, *(metadata->ToValue().get())));
+}
+
 static base::LazyInstance<PdfFunctions> g_pdf_lib = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 ChromeContentUtilityClient::ChromeContentUtilityClient() {
 #if !defined(OS_ANDROID)
   handlers_.push_back(new ProfileImportHandler());
 #endif  // OS_ANDROID
 
 #if defined(ENABLE_MDNS)
@@ skipping 33 matching lines @@
                         OnRobustJPEGDecodeImage)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseJSON, OnParseJSON)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_GetPrinterCapsAndDefaults,
                         OnGetPrinterCapsAndDefaults)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_StartupPing, OnStartupPing)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_AnalyzeZipFileForDownloadProtection,
                         OnAnalyzeZipFileForDownloadProtection)
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_CheckMediaFile, OnCheckMediaFile)
+    IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseMediaMetadata,
+                        OnParseMediaMetadata)
+    IPC_MESSAGE_HANDLER(
+        ChromeUtilityMsg_ParseMediaMetadata_RequestBlobBytes_Finished,
+        OnParseMediaMetadataRequestBlobBytesFinished)
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 #if defined(OS_CHROMEOS)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_CreateZipFile, OnCreateZipFile)
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_WIN)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseITunesPrefXml,
                         OnParseITunesPrefXml)
 #endif  // defined(OS_WIN)
@@ skipping 397 matching lines @@
 void ChromeContentUtilityClient::OnCheckMediaFile(
     int64 milliseconds_of_decoding,
     const IPC::PlatformFileForTransit& media_file) {
   media::MediaFileChecker
       checker(IPC::PlatformFileForTransitToPlatformFile(media_file));
   const bool check_success = checker.Start(
       base::TimeDelta::FromMilliseconds(milliseconds_of_decoding));
   Send(new ChromeUtilityHostMsg_CheckMediaFile_Finished(check_success));
   ReleaseProcessIfNeeded();
 }
+
+void ChromeContentUtilityClient::OnParseMediaMetadata(
+    const std::string& mime_type,
+    int64 total_size) {
+  DCHECK(!media_metadata_parser_);
+  DCHECK(!ipc_tunnel_data_source_);
+
+  ipc_tunnel_data_source_.reset(new metadata::IPCTunnelDataSource(total_size));
+  media_metadata_parser_.reset(new metadata::MediaMetadataParser(
+      ipc_tunnel_data_source_.get(), mime_type));
+  media_metadata_parser_->Start(base::Bind(&SendMediaMetadataToHost));
+}
+
+void ChromeContentUtilityClient::OnParseMediaMetadataRequestBlobBytesFinished(

[vandebo (ex-Chrome), 2014/01/07 18:34:59]

I suggest making IPCDataSource a message Listener and adding it to |handlers_|. 
That way it will both send and receive message instead of only sending them. 
However, you'd need a mechanism to remove it from handlers_ as well and that may
not be worth the effort...

[tommycli, 2014/01/07 20:23:31]

Done. This is better, but I have one concern left:

What if in a different function, another IPCDataSource is created and added to
handlers_? In that case, the newly created IPCDataSource will never receive any
messages.

I think whether or not this will become a problem - and the solution, will
become apparent in further CLs though, so I'm okay with this for right now...

+    int64 request_id,
+    const std::string& bytes) {
+  if (!ipc_tunnel_data_source_)
+    return;
+  ipc_tunnel_data_source_->ReceiveBytes(request_id, bytes);
+}
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 #if defined(OS_WIN)
 void ChromeContentUtilityClient::OnParseITunesPrefXml(
     const std::string& itunes_xml_data) {
   base::FilePath library_path(
       itunes::FindLibraryLocationInPrefXml(itunes_xml_data));
   Send(new ChromeUtilityHostMsg_GotITunesDirectory(library_path));
   ReleaseProcessIfNeeded();
 }
@@ skipping 55 matching lines @@
   picasa::PicasaAlbumsIndexer indexer(album_uids);
   indexer.ParseFolderINI(folders_inis);
 
   Send(new ChromeUtilityHostMsg_IndexPicasaAlbumsContents_Finished(
       indexer.albums_images()));
   ReleaseProcessIfNeeded();
 }
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 }  // namespace chrome