More SynchronousInterfacePtr conversion + some related pexe content handler cleanup.

services/nacl/nonsfi/content_handler_main_pexe.cc

 // Copyright 2015 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 <fcntl.h>
 
 #include "base/files/file_util.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
 #include "mojo/file_utils/file_util.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/nacl/nonsfi/file_util.h"
 #include "mojo/nacl/nonsfi/nexe_launcher_nonsfi.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/synchronous_interface_ptr.h"
 #include "mojo/services/files/interfaces/directory.mojom-sync.h"
 #include "mojo/services/files/interfaces/files.mojom.h"
-#include "services/nacl/nonsfi/pnacl_compile.mojom.h"
-#include "services/nacl/nonsfi/pnacl_link.mojom.h"
+#include "services/nacl/nonsfi/pnacl_compile.mojom-sync.h"
+#include "services/nacl/nonsfi/pnacl_link.mojom-sync.h"
 
 namespace nacl {
 namespace content_handler {
-namespace {
-
-class CompilerUI {
- public:
-  explicit CompilerUI(mojo::ScopedMessagePipeHandle handle) {
-    compiler_.Bind(
-        mojo::InterfaceHandle<mojo::nacl::PexeCompiler>(handle.Pass(), 0u));
-  }
-
-  // Synchronous method to compile pexe into object file.
-  mojo::Array<mojo::String> CompilePexe(mojo::String pexe_file_path) {
-    mojo::Array<mojo::String> output;
-    compiler_->PexeCompile(
-        pexe_file_path,
-        [&output](mojo::Array<mojo::String> o) { output = o.Pass(); });
-    CHECK(compiler_.WaitForIncomingResponse())
-        << "Waiting for pexe compiler failed";
-    return output;
-  }
-
- private:
-  mojo::nacl::PexeCompilerPtr compiler_;
-};
-
-class LinkerUI {
- public:
-  explicit LinkerUI(mojo::ScopedMessagePipeHandle handle) {
-    linker_.Bind(
-        mojo::InterfaceHandle<mojo::nacl::PexeLinker>(handle.Pass(), 0u));
-  }
-
-  // Synchronous method to link object file into nexe.
-  mojo::String LinkPexe(mojo::Array<mojo::String> object_file_paths) {
-    mojo::String output;
-    linker_->PexeLink(std::move(object_file_paths),
-                      [&output](mojo::String o) { output = o; });
-    CHECK(linker_.WaitForIncomingResponse())
-        << "Waiting for pexe linker failed";
-    return output;
-  }
-
- private:
-  mojo::nacl::PexeLinkerPtr linker_;
-};
-
-}  // namespace anonymous
 
 class PexeContentHandler : public mojo::ApplicationDelegate,
                            public mojo::ContentHandlerFactory::Delegate {
  public:
   PexeContentHandler() : content_handler_factory_(this) {}
 
  private:
   // Overridden from ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* app) override {
     mojo::ConnectToService(app->shell(), "mojo:pnacl_compile",
-                           GetProxy(&compiler_init_));
+                           GetSynchronousProxy(&compiler_init_));
     mojo::ConnectToService(app->shell(), "mojo:pnacl_link",
-                           GetProxy(&linker_init_));
+                           GetSynchronousProxy(&linker_init_));
     mojo::ConnectToService(app->shell(), "mojo:files", GetProxy(&files_));
     mojo::files::Error error = mojo::files::Error::INTERNAL;
     files_->OpenFileSystem("app_persistent_cache",
                            GetSynchronousProxy(&nexe_cache_directory_),
                            [&error](mojo::files::Error e) { error = e; });
     CHECK(files_.WaitForIncomingResponse());
     CHECK_EQ(mojo::files::Error::OK, error);
   }
 
   // Overridden from ApplicationDelegate:
@@ skipping 31 matching lines @@
 
     // The file is named after the hash of the requesting pexe.
     // This makes it usable by future requests for the same pexe under different
     // names. It also atomically moves the entire temp file.
     CHECK(nexe_cache_directory_->Rename(temp_file_name, digest, &error));
     CHECK_EQ(mojo::files::Error::OK, error);
   }
 
   int DoPexeTranslation(base::FilePath& pexe_file_path) {
     // Compile the pexe into an object file
-    mojo::ScopedMessagePipeHandle parent_compile_pipe;
-    mojo::ScopedMessagePipeHandle child_compile_pipe;
-    CHECK_EQ(CreateMessagePipe(nullptr, &parent_compile_pipe,
-                               &child_compile_pipe), MOJO_RESULT_OK)
-        << "Could not create message pipe to compiler";
-    compiler_init_->PexeCompilerStart(child_compile_pipe.Pass());
+    mojo::SynchronousInterfacePtr<mojo::nacl::PexeCompiler> compiler;
+    CHECK(compiler_init_->PexeCompilerStart(GetSynchronousProxy(&compiler)));
 
     // Communicate with the compiler using a mojom interface.
-    CompilerUI compiler_ui(parent_compile_pipe.Pass());
-    mojo::Array<mojo::String> object_files =
-        compiler_ui.CompilePexe(pexe_file_path.value());
+    mojo::Array<mojo::String> object_files;
+    CHECK(compiler->PexeCompile(pexe_file_path.value(), &object_files));
 
     // Link the object file into a nexe
-    mojo::ScopedMessagePipeHandle parent_link_pipe;
-    mojo::ScopedMessagePipeHandle child_link_pipe;
-    CHECK_EQ(CreateMessagePipe(nullptr, &parent_link_pipe, &child_link_pipe),
-             MOJO_RESULT_OK) << "Could not create message pipe to linker";
-    linker_init_->PexeLinkerStart(child_link_pipe.Pass());
+    mojo::SynchronousInterfacePtr<mojo::nacl::PexeLinker> linker;
+    CHECK(linker_init_->PexeLinkerStart(GetSynchronousProxy(&linker)));
 
     // Communicate with the linker using a mojom interface.
-    LinkerUI linker_ui(parent_link_pipe.Pass());
-    mojo::String nexe_file = linker_ui.LinkPexe(std::move(object_files));
+    mojo::String nexe_file;
+    CHECK(linker->PexeLink(std::move(object_files), &nexe_file));
 
     // Open the nexe file and launch it (with our mojo handle)
     int nexe_fd = open(nexe_file.get().c_str(), O_RDONLY);
     CHECK(!unlink(nexe_file.get().c_str()))
         << "Could not unlink temporary nexe file";
     CHECK_GE(nexe_fd, 0) << "Could not open nexe object file";
     return nexe_fd;
   }
 
   // Overridden from ContentHandlerFactory::Delegate:
@@ skipping 27 matching lines @@
     // Pass the handle connecting us with mojo_shell to the nexe.
     MojoHandle handle = application_request.PassMessagePipe().release().value();
     ::nacl::MojoLaunchNexeNonsfi(nexe_fd, handle,
                                  false /* enable_translation_irt */);
   }
 
  private:
   mojo::SynchronousInterfacePtr<mojo::files::Directory> nexe_cache_directory_;
   mojo::files::FilesPtr files_;
   mojo::ContentHandlerFactory content_handler_factory_;
-  mojo::nacl::PexeCompilerInitPtr compiler_init_;
-  mojo::nacl::PexeLinkerInitPtr linker_init_;
+  mojo::SynchronousInterfacePtr<mojo::nacl::PexeCompilerInit> compiler_init_;
+  mojo::SynchronousInterfacePtr<mojo::nacl::PexeLinkerInit> linker_init_;
 
   DISALLOW_COPY_AND_ASSIGN(PexeContentHandler);
 };
 
 }  // namespace content_handler
 }  // namespace nacl
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(
       new nacl::content_handler::PexeContentHandler());
   return runner.Run(application_request);
 }