Convert utility process ParseMediaMetadata blob reading IPC to mojo

chrome/utility/extensions/extensions_handler.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/utility/extensions/extensions_handler.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/path_service.h"
@@ skipping 28 matching lines @@
 
 #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)
 
 namespace {
 
-void ReleaseProcessIfNeeded() {
-  content::UtilityThread::Get()->ReleaseProcessIfNeeded();
-}
-
 class MediaParserImpl : public extensions::mojom::MediaParser {
  public:
-  static void Create(ChromeContentUtilityClient* utility_client,
-                     extensions::mojom::MediaParserRequest request) {
-    mojo::MakeStrongBinding(base::MakeUnique<MediaParserImpl>(utility_client),
+  MediaParserImpl() = default;
+  ~MediaParserImpl() override = default;
+
+  static void Create(extensions::mojom::MediaParserRequest request) {
+    mojo::MakeStrongBinding(base::MakeUnique<MediaParserImpl>(),
                             std::move(request));
   }
 
-  explicit MediaParserImpl(ChromeContentUtilityClient* utility_client)
-      : utility_client_(utility_client) {}
-
-  ~MediaParserImpl() override = default;
-
  private:
   // extensions::mojom::MediaParser:
-  void ParseMediaMetadata(const std::string& mime_type,
-                          int64_t total_size,
-                          bool get_attached_images,
-                          const ParseMediaMetadataCallback& callback) override {
-    // Only one IPCDataSource may be created and added to the list of handlers.
-    auto source = base::MakeUnique<metadata::IPCDataSource>(total_size);
+  void ParseMediaMetadata(
+      const std::string& mime_type,
+      int64_t total_size,
+      bool get_attached_images,
+      extensions::mojom::MediaDataSourcePtr media_data_source,
+      const ParseMediaMetadataCallback& callback) override {
+    auto source = base::MakeUnique<metadata::IPCDataSource>(
+        std::move(media_data_source), total_size);
     metadata::MediaMetadataParser* parser = new metadata::MediaMetadataParser(
-        source.get(), mime_type, get_attached_images);
-    utility_client_->AddHandler(std::move(source));
+        std::move(source), mime_type, get_attached_images);
     parser->Start(base::Bind(&MediaParserImpl::ParseMediaMetadataDone, callback,
                              base::Owned(parser)));
   }
 
   static void ParseMediaMetadataDone(
       const ParseMediaMetadataCallback& callback,
       metadata::MediaMetadataParser* /* parser */,
       const extensions::api::media_galleries::MediaMetadata& metadata,
       const std::vector<metadata::AttachedImage>& attached_images) {
     callback.Run(true, metadata.ToValue(), attached_images);
-    ReleaseProcessIfNeeded();
   }
 
   void CheckMediaFile(base::TimeDelta decode_time,
                       base::File file,
                       const CheckMediaFileCallback& callback) override {
 #if !defined(MEDIA_DISABLE_FFMPEG)
     media::MediaFileChecker checker(std::move(file));
     callback.Run(checker.Start(decode_time));
 #else
     callback.Run(false);
 #endif
   }
 
-  ChromeContentUtilityClient* const utility_client_;
-
   DISALLOW_COPY_AND_ASSIGN(MediaParserImpl);
 };
 
 #if defined(OS_WIN)
 class WiFiCredentialsGetterImpl
     : public extensions::mojom::WiFiCredentialsGetter {
  public:
   WiFiCredentialsGetterImpl() = default;
   ~WiFiCredentialsGetterImpl() override = default;
 
@@ skipping 43 matching lines @@
 
 // static
 void ExtensionsHandler::PreSandboxStartup() {
   // Initialize media libraries for media file validation.
   media::InitializeMediaLibrary();
 }
 
 // static
 void ExtensionsHandler::ExposeInterfacesToBrowser(
     service_manager::InterfaceRegistry* registry,
-    ChromeContentUtilityClient* utility_client,
     bool running_elevated) {
   // If our process runs with elevated privileges, only add elevated Mojo
   // services to the interface registry.
   if (running_elevated) {
 #if defined(OS_WIN)
     registry->AddInterface(base::Bind(&WiFiCredentialsGetterImpl::Create));
 #endif
     return;
   }
 
-  registry->AddInterface(base::Bind(&MediaParserImpl::Create, utility_client));
+  registry->AddInterface(base::Bind(&MediaParserImpl::Create));
 }
 
 bool ExtensionsHandler::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ExtensionsHandler, message)
 #if defined(OS_WIN)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseITunesPrefXml,
                         OnParseITunesPrefXml)
 #endif  // defined(OS_WIN)
 
@@ skipping 12 matching lines @@
   return handled || utility_handler_.OnMessageReceived(message);
 }
 
 #if defined(OS_WIN)
 void ExtensionsHandler::OnParseITunesPrefXml(
     const std::string& itunes_xml_data) {
   base::FilePath library_path(
       itunes::FindLibraryLocationInPrefXml(itunes_xml_data));
   content::UtilityThread::Get()->Send(
       new ChromeUtilityHostMsg_GotITunesDirectory(library_path));
-  ReleaseProcessIfNeeded();
+  content::UtilityThread::Get()->ReleaseProcessIfNeeded();
 }
 #endif  // defined(OS_WIN)
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
 void ExtensionsHandler::OnParseITunesLibraryXmlFile(
     const IPC::PlatformFileForTransit& itunes_library_file) {
   itunes::ITunesLibraryParser parser;
   base::File file = IPC::PlatformFileForTransitToFile(itunes_library_file);
   bool result = parser.Parse(iapps::ReadFileAsString(std::move(file)));
   content::UtilityThread::Get()->Send(
       new ChromeUtilityHostMsg_GotITunesLibrary(result, parser.library()));
-  ReleaseProcessIfNeeded();
+  content::UtilityThread::Get()->ReleaseProcessIfNeeded();
 }
 
 void ExtensionsHandler::OnParsePicasaPMPDatabase(
     const picasa::AlbumTableFilesForTransit& album_table_files) {
   picasa::AlbumTableFiles files;
   files.indicator_file =
       IPC::PlatformFileForTransitToFile(album_table_files.indicator_file);
   files.category_file =
       IPC::PlatformFileForTransitToFile(album_table_files.category_file);
   files.date_file =
       IPC::PlatformFileForTransitToFile(album_table_files.date_file);
   files.filename_file =
       IPC::PlatformFileForTransitToFile(album_table_files.filename_file);
   files.name_file =
       IPC::PlatformFileForTransitToFile(album_table_files.name_file);
   files.token_file =
       IPC::PlatformFileForTransitToFile(album_table_files.token_file);
   files.uid_file =
       IPC::PlatformFileForTransitToFile(album_table_files.uid_file);
 
   picasa::PicasaAlbumTableReader reader(std::move(files));
   bool parse_success = reader.Init();
   content::UtilityThread::Get()->Send(
       new ChromeUtilityHostMsg_ParsePicasaPMPDatabase_Finished(
           parse_success, reader.albums(), reader.folders()));
-  ReleaseProcessIfNeeded();
+  content::UtilityThread::Get()->ReleaseProcessIfNeeded();
 }
 
 void ExtensionsHandler::OnIndexPicasaAlbumsContents(
     const picasa::AlbumUIDSet& album_uids,
     const std::vector<picasa::FolderINIContents>& folders_inis) {
   picasa::PicasaAlbumsIndexer indexer(album_uids);
   indexer.ParseFolderINI(folders_inis);
   content::UtilityThread::Get()->Send(
       new ChromeUtilityHostMsg_IndexPicasaAlbumsContents_Finished(
           indexer.albums_images()));
-  ReleaseProcessIfNeeded();
+  content::UtilityThread::Get()->ReleaseProcessIfNeeded();
 }
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 }  // namespace extensions