Convert utility process CheckMediaFile 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 {
 
-bool Send(IPC::Message* message) {
-  return content::UtilityThread::Get()->Send(message);
-}
-
 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),
                             std::move(request));
@@ skipping 21 matching lines @@
 
   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
+    ReleaseProcessIfNeeded();
+  }
+
   ChromeContentUtilityClient* const utility_client_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaParserImpl);
 };
 
 #if defined(OS_WIN)
 class WiFiCredentialsGetterImpl
     : public extensions::mojom::WiFiCredentialsGetter {
  public:
   WiFiCredentialsGetterImpl() = default;
@@ skipping 62 matching lines @@
 #endif
     return;
   }
 
   registry->AddInterface(base::Bind(&MediaParserImpl::Create, utility_client));
 }
 
 bool ExtensionsHandler::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ExtensionsHandler, message)
-    IPC_MESSAGE_HANDLER(ChromeUtilityMsg_CheckMediaFile, OnCheckMediaFile)
-
 #if defined(OS_WIN)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseITunesPrefXml,
                         OnParseITunesPrefXml)
 #endif  // defined(OS_WIN)
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseITunesLibraryXmlFile,
                         OnParseITunesLibraryXmlFile)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParsePicasaPMPDatabase,
                         OnParsePicasaPMPDatabase)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_IndexPicasaAlbumsContents,
                         OnIndexPicasaAlbumsContents)
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled || utility_handler_.OnMessageReceived(message);
 }
 
-void ExtensionsHandler::OnCheckMediaFile(
-    int64_t milliseconds_of_decoding,
-    const IPC::PlatformFileForTransit& media_file) {
-#if !defined(MEDIA_DISABLE_FFMPEG)
-  media::MediaFileChecker checker(
-      IPC::PlatformFileForTransitToFile(media_file));
-  const bool check_success = checker.Start(
-      base::TimeDelta::FromMilliseconds(milliseconds_of_decoding));
-  Send(new ChromeUtilityHostMsg_CheckMediaFile_Finished(check_success));
-#else
-  Send(new ChromeUtilityHostMsg_CheckMediaFile_Finished(false));
-#endif
-  ReleaseProcessIfNeeded();
-}
-
 #if defined(OS_WIN)
 void ExtensionsHandler::OnParseITunesPrefXml(
     const std::string& itunes_xml_data) {
   base::FilePath library_path(
       itunes::FindLibraryLocationInPrefXml(itunes_xml_data));
-  Send(new ChromeUtilityHostMsg_GotITunesDirectory(library_path));
+  content::UtilityThread::Get()->Send(
+      new ChromeUtilityHostMsg_GotITunesDirectory(library_path));
   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)));
-  Send(new ChromeUtilityHostMsg_GotITunesLibrary(result, parser.library()));
+  content::UtilityThread::Get()->Send(
+      new ChromeUtilityHostMsg_GotITunesLibrary(result, parser.library()));
   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();
-  Send(new ChromeUtilityHostMsg_ParsePicasaPMPDatabase_Finished(
-      parse_success, reader.albums(), reader.folders()));
+  content::UtilityThread::Get()->Send(
+      new ChromeUtilityHostMsg_ParsePicasaPMPDatabase_Finished(
+          parse_success, reader.albums(), reader.folders()));
   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);
-
-  Send(new ChromeUtilityHostMsg_IndexPicasaAlbumsContents_Finished(
-      indexer.albums_images()));
+  content::UtilityThread::Get()->Send(
+      new ChromeUtilityHostMsg_IndexPicasaAlbumsContents_Finished(
+          indexer.albums_images()));
   ReleaseProcessIfNeeded();
 }
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 }  // namespace extensions