Convert //mojo/file_utils to use SynchronousInterfacePtr.

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/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"
 
 namespace nacl {
 namespace content_handler {
 namespace {
 
 class CompilerUI {
  public:
@@ skipping 46 matching lines @@
   PexeContentHandler() : content_handler_factory_(this) {}
 
  private:
   // Overridden from ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* app) override {
     app->ConnectToServiceDeprecated("mojo:pnacl_compile", &compiler_init_);
     app->ConnectToServiceDeprecated("mojo:pnacl_link", &linker_init_);
     app->ConnectToServiceDeprecated("mojo:files", &files_);
     mojo::files::Error error = mojo::files::Error::INTERNAL;
     files_->OpenFileSystem("app_persistent_cache",
-                           GetProxy(&nexe_cache_directory),
+                           GetSynchronousProxy(&nexe_cache_directory_),
                            [&error](mojo::files::Error e) { error = e; });
     CHECK(files_.WaitForIncomingResponse());
     CHECK_EQ(mojo::files::Error::OK, error);
   }
 
   // Overridden from ApplicationDelegate:
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
     connection->AddService(&content_handler_factory_);
     return true;
   }
 
   int AccessFileFromCache(std::string& digest) {
     mojo::files::Error error = mojo::files::Error::INTERNAL;
     mojo::files::FilePtr nexe_cache_file;
-    nexe_cache_directory->OpenFile(
-        digest, GetProxy(&nexe_cache_file), mojo::files::kOpenFlagRead,
-        [&error](mojo::files::Error e) { error = e; });
-    CHECK(nexe_cache_directory.WaitForIncomingResponse());
+    CHECK(nexe_cache_directory_->OpenFile(digest, GetProxy(&nexe_cache_file),
+                                          mojo::files::kOpenFlagRead, &error));
     if (mojo::files::Error::OK == error)
       // Copy the mojo cached file into an open temporary file.
       return ::nacl::MojoFileToTempFileDescriptor(nexe_cache_file.Pass());
     else
       // If error != OK, The failure may have been for a variety of reasons --
       // assume that the file does not exist.
       return -1;
   }
 
   void StoreFileInCache(int nexe_fd, std::string& digest) {
     // First, open a "temporary" file.
     mojo::files::Error error = mojo::files::Error::INTERNAL;
     std::string temp_file_name;
-    mojo::files::FilePtr nexe_cache_file = file_utils::CreateTemporaryFileInDir(
-        &nexe_cache_directory, &temp_file_name);
+    auto nexe_cache_file =
+        mojo::files::FilePtr::Create(file_utils::CreateTemporaryFileInDir(
+            &nexe_cache_directory_, &temp_file_name));
     CHECK(nexe_cache_file);
 
     // Copy the contents of nexe_fd into the temporary Mojo file.
     FileDescriptorToMojoFile(nexe_fd, nexe_cache_file.Pass());
 
     // 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.
-    nexe_cache_directory->Rename(temp_file_name, digest,
-                                 [&error](mojo::files::Error e) { error = e; });
-    CHECK(nexe_cache_directory.WaitForIncomingResponse());
+    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";
@@ skipping 51 matching lines @@
       StoreFileInCache(nexe_fd, digest);
     }
 
     // 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::files::DirectoryPtr nexe_cache_directory;
+  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_;
 
   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);
 }