Convert utility process ImageWriter 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/files/file_path.h"
 #include "base/path_service.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/chrome_extensions_client.h"
 #include "chrome/common/extensions/chrome_utility_extensions_messages.h"
 #include "chrome/common/extensions/media_parser.mojom.h"
+#include "chrome/common/extensions/removable_storage_writer.mojom.h"
 #include "chrome/common/media_galleries/metadata_types.h"
 #include "chrome/utility/chrome_content_utility_client.h"
+#include "chrome/utility/image_writer/image_writer_handler.h"
 #include "chrome/utility/media_galleries/ipc_data_source.h"
 #include "chrome/utility/media_galleries/media_metadata_parser.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/utility/utility_thread.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_utility_messages.h"
 #include "extensions/utility/unpacker.h"
 #include "media/base/media.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
@@ skipping 68 matching lines @@
 #else
     callback.Run(false);
 #endif
   }
 
   ChromeContentUtilityClient* const utility_client_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaParserImpl);
 };
 
+class RemovableStorageWriterImpl
+    : public extensions::mojom::RemovableStorageWriter {
+ public:
+  RemovableStorageWriterImpl() = default;
+  ~RemovableStorageWriterImpl() override = default;
+
+  static void Create(extensions::mojom::RemovableStorageWriterRequest request) {
+    mojo::MakeStrongBinding(base::MakeUnique<RemovableStorageWriterImpl>(),
+                            std::move(request));
+  }
+
+ private:
+  void Write(
+      const base::FilePath& source,
+      const base::FilePath& target,
+      extensions::mojom::RemovableStorageWriterClientPtr client) override {
+    writer_.Write(source, target, std::move(client));
+  }
+
+  void Verify(
+      const base::FilePath& source,
+      const base::FilePath& target,
+      extensions::mojom::RemovableStorageWriterClientPtr client) override {
+    writer_.Verify(source, target, std::move(client));
+  }
+
+  image_writer::ImageWriterHandler writer_;
+
+  DISALLOW_COPY_AND_ASSIGN(RemovableStorageWriterImpl);
+};
+
 #if defined(OS_WIN)
 class WiFiCredentialsGetterImpl
     : public extensions::mojom::WiFiCredentialsGetter {
  public:
   WiFiCredentialsGetterImpl() = default;
   ~WiFiCredentialsGetterImpl() override = default;
 
   static void Create(extensions::mojom::WiFiCredentialsGetterRequest request) {
     mojo::MakeStrongBinding(base::MakeUnique<WiFiCredentialsGetterImpl>(),
                             std::move(request));
@@ skipping 46 matching lines @@
 
 // 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(&RemovableStorageWriterImpl::Create));
     registry->AddInterface(base::Bind(&WiFiCredentialsGetterImpl::Create));
 #endif
     return;
   }
 
   registry->AddInterface(base::Bind(&MediaParserImpl::Create, utility_client));
+#if !defined(OS_WIN)
+  registry->AddInterface(base::Bind(&RemovableStorageWriterImpl::Create));

[dcheng, 2017/02/06 05:52:02]

Out of curiosity, why can't this just talk to ImageWriterHandler directly?

[Noel Gordon, 2017/02/07 11:31:09]

Maybe it could, but the goal here was not to have exactly one instance
ImageWriterHandler, as a member of the mojo class, as it was in the original
code, so it can be kept alive b/w Write and Verify operations, so that any open
file handles remain open b/w operations.  And all this to avoid bug
http://crbug.com/352442.

+#endif
 }
 
 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 66 matching lines @@
   picasa::PicasaAlbumsIndexer indexer(album_uids);
   indexer.ParseFolderINI(folders_inis);
   content::UtilityThread::Get()->Send(
       new ChromeUtilityHostMsg_IndexPicasaAlbumsContents_Finished(
           indexer.albums_images()));
   ReleaseProcessIfNeeded();
 }
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 }  // namespace extensions