More SynchronousInterfacePtr conversion + some related pexe content handler cleanup.

mojo/nacl/nonsfi/irt_pnacl_translator_compile.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/logging.h"
 #include "build/build_config.h"
 #include "mojo/nacl/nonsfi/irt_mojo_nonsfi.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/utility/run_loop.h"
 #include "native_client/src/untrusted/irt/irt_dev.h"
 #include "services/nacl/nonsfi/pnacl_compile.mojom.h"
 
 namespace {
 
 // Implements a mojom interface which allows the content handler to communicate
 // with the nexe compiler service.
 class PexeCompilerImpl : public mojo::nacl::PexeCompiler {
  public:
-  PexeCompilerImpl(mojo::ScopedMessagePipeHandle handle,
-                   const struct nacl_irt_pnacl_compile_funcs* funcs)
-      : funcs_(funcs), strong_binding_(this, handle.Pass()) {}
+  PexeCompilerImpl(
+      mojo::InterfaceRequest<mojo::nacl::PexeCompiler> compiler_request,
+      const struct nacl_irt_pnacl_compile_funcs* funcs)
+      : funcs_(funcs), strong_binding_(this, compiler_request.Pass()) {}
   void PexeCompile(const mojo::String& pexe_file_name, const
                    mojo::Callback<void(mojo::Array<mojo::String>)>& callback)
       override {
     const static uint32_t num_threads = 4;
 #if defined(ARCH_CPU_ARM_FAMILY)
     // pnacl-llc supports split modules.
     const size_t obj_file_count = num_threads;
 #else
     // subzero does need split modules.
     const size_t obj_file_count = 1;
@@ skipping 73 matching lines @@
 
 void ServeTranslateRequest(const struct nacl_irt_pnacl_compile_funcs* funcs) {
   // Acquire the handle -- this is our mechanism to contact the
   // content handler which called us.
   MojoHandle handle;
   nacl::MojoGetInitialHandle(&handle);
 
   // Convert the MojoHandle into a ScopedMessagePipeHandle, and use that to
   // implement the PexeCompiler interface.
   PexeCompilerImpl impl(
-      mojo::ScopedMessagePipeHandle(mojo::MessagePipeHandle(handle)).Pass(),
+      mojo::MakeRequest<mojo::nacl::PexeCompiler>(
+          mojo::ScopedMessagePipeHandle(mojo::MessagePipeHandle(handle))),
       funcs);
   mojo::RunLoop::current()->Run();
 }
 
 }  // namespace anonymous
 
 namespace nacl {
 
 const struct nacl_irt_private_pnacl_translator_compile
     nacl_irt_private_pnacl_translator_compile = {
   ServeTranslateRequest
 };
 
 }  // namespace nacl