Privatize StrongBinding lifetime management

components/filesystem/directory_impl.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 "components/filesystem/directory_impl.h"
 
 #include <utility>
 
 #include "base/files/file.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "components/filesystem/file_impl.h"
 #include "components/filesystem/lock_table.h"
 #include "components/filesystem/util.h"
 #include "mojo/common/common_type_converters.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 
 namespace filesystem {
 
-DirectoryImpl::DirectoryImpl(mojo::InterfaceRequest<mojom::Directory> request,
-                             base::FilePath directory_path,
+DirectoryImpl::DirectoryImpl(base::FilePath directory_path,
                              scoped_refptr<SharedTempDir> temp_dir,
                              scoped_refptr<LockTable> lock_table)
-    : binding_(this, std::move(request)),
-      directory_path_(directory_path),
+    : directory_path_(directory_path),
       temp_dir_(std::move(temp_dir)),
       lock_table_(std::move(lock_table)) {}
 
 DirectoryImpl::~DirectoryImpl() {}
 
 void DirectoryImpl::Read(const ReadCallback& callback) {
   mojo::Array<mojom::DirectoryEntryPtr> entries;
   base::FileEnumerator directory_enumerator(
       directory_path_, false,
       base::FileEnumerator::DIRECTORIES | base::FileEnumerator::FILES);
   for (base::FilePath name = directory_enumerator.Next(); !name.empty();
        name = directory_enumerator.Next()) {
     base::FileEnumerator::FileInfo info = directory_enumerator.GetInfo();
     mojom::DirectoryEntryPtr entry = mojom::DirectoryEntry::New();
     entry->type = info.IsDirectory() ? mojom::FsFileType::DIRECTORY
                                      : mojom::FsFileType::REGULAR_FILE;
     entry->name = info.GetName().AsUTF8Unsafe();
     entries.push_back(std::move(entry));
   }
 
   callback.Run(mojom::FileError::OK, std::move(entries));
 }
 
 // TODO(erg): Consider adding an implementation of Stat()/Touch() to the
 // directory, too. Right now, the base::File abstractions do not really deal
 // with directories properly, so these are broken for now.
 
 // TODO(vtl): Move the implementation to a thread pool.
 void DirectoryImpl::OpenFile(const mojo::String& raw_path,
-                             mojo::InterfaceRequest<mojom::File> file,
+                             mojom::FileRequest file,
                              uint32_t open_flags,
                              const OpenFileCallback& callback) {
   base::FilePath path;
   mojom::FileError error = ValidatePath(raw_path, directory_path_, &path);
   if (error != mojom::FileError::OK) {
     callback.Run(error);
     return;
   }
 
   if (base::DirectoryExists(path)) {
     // We must not return directories as files. In the file abstraction, we can
     // fetch raw file descriptors over mojo pipes, and passing a file
     // descriptor to a directory is a sandbox escape on Windows.
     callback.Run(mojom::FileError::NOT_A_FILE);
     return;
   }
 
   base::File base_file(path, open_flags);
   if (!base_file.IsValid()) {
     callback.Run(GetError(base_file));
     return;
   }
 
   if (file.is_pending()) {
-    new FileImpl(std::move(file), path, std::move(base_file), temp_dir_,
-                 lock_table_);
+    mojo::MakeStrongBinding(
+        base::MakeUnique<FileImpl>(path, std::move(base_file), temp_dir_,
+                                   lock_table_),
+        std::move(file));
   }
   callback.Run(mojom::FileError::OK);
 }
 
 void DirectoryImpl::OpenFileHandle(const mojo::String& raw_path,
                                    uint32_t open_flags,
                                    const OpenFileHandleCallback& callback) {
   mojom::FileError error = mojom::FileError::OK;
   mojo::ScopedHandle handle = OpenFileHandleImpl(raw_path, open_flags, &error);
   callback.Run(error, std::move(handle));
 }
 
 void DirectoryImpl::OpenFileHandles(
     mojo::Array<mojom::FileOpenDetailsPtr> details,
     const OpenFileHandlesCallback& callback) {
   mojo::Array<mojom::FileOpenResultPtr> results(
       mojo::Array<mojom::FileOpenResultPtr>::New(details.size()));
   size_t i = 0;
   for (const auto& detail : details) {
     mojom::FileOpenResultPtr result(mojom::FileOpenResult::New());
     result->path = detail->path;
     result->file_handle =
         OpenFileHandleImpl(detail->path, detail->open_flags, &result->error);
     results[i++] = std::move(result);
   }
   callback.Run(std::move(results));
 }
 
-void DirectoryImpl::OpenDirectory(
-    const mojo::String& raw_path,
-    mojo::InterfaceRequest<mojom::Directory> directory,
-    uint32_t open_flags,
-    const OpenDirectoryCallback& callback) {
+void DirectoryImpl::OpenDirectory(const mojo::String& raw_path,
+                                  mojom::DirectoryRequest directory,
+                                  uint32_t open_flags,
+                                  const OpenDirectoryCallback& callback) {
   base::FilePath path;
   mojom::FileError error = ValidatePath(raw_path, directory_path_, &path);
   if (error != mojom::FileError::OK) {
     callback.Run(error);
     return;
   }
 
   if (!base::DirectoryExists(path)) {
     if (base::PathExists(path)) {
       callback.Run(mojom::FileError::NOT_A_DIRECTORY);
       return;
     }
 
     if (!(open_flags & mojom::kFlagOpenAlways ||
           open_flags & mojom::kFlagCreate)) {
       // The directory doesn't exist, and we weren't passed parameters to
       // create it.
       callback.Run(mojom::FileError::NOT_FOUND);
       return;
     }
 
     base::File::Error error;
     if (!base::CreateDirectoryAndGetError(path, &error)) {
       callback.Run(static_cast<filesystem::mojom::FileError>(error));
       return;
     }
   }
 
-  if (directory.is_pending())
-    new DirectoryImpl(std::move(directory), path, temp_dir_, lock_table_);
+  if (directory.is_pending()) {
+    mojo::MakeStrongBinding(
+        base::MakeUnique<DirectoryImpl>(path, temp_dir_, lock_table_),
+        std::move(directory));
+  }
+
   callback.Run(mojom::FileError::OK);
 }
 
 void DirectoryImpl::Rename(const mojo::String& raw_old_path,
                            const mojo::String& raw_new_path,
                            const RenameCallback& callback) {
   base::FilePath old_path;
   mojom::FileError error =
       ValidatePath(raw_old_path, directory_path_, &old_path);
   if (error != mojom::FileError::OK) {
@@ skipping 92 matching lines @@
 
   base::File::Info info;
   if (!base_file.GetInfo(&info)) {
     callback.Run(mojom::FileError::FAILED, nullptr);
     return;
   }
 
   callback.Run(mojom::FileError::OK, MakeFileInformation(info));
 }
 
-void DirectoryImpl::Clone(mojo::InterfaceRequest<mojom::Directory> directory) {
+void DirectoryImpl::Clone(mojom::DirectoryRequest directory) {
   if (directory.is_pending()) {
-    new DirectoryImpl(std::move(directory), directory_path_,
-                      temp_dir_, lock_table_);
+    mojo::MakeStrongBinding(base::MakeUnique<DirectoryImpl>(
+                                directory_path_, temp_dir_, lock_table_),
+                            std::move(directory));
   }
 }
 
 void DirectoryImpl::ReadEntireFile(const mojo::String& raw_path,
                                    const ReadEntireFileCallback& callback) {
   base::FilePath path;
   mojom::FileError error = ValidatePath(raw_path, directory_path_, &path);
   if (error != mojom::FileError::OK) {
     callback.Run(error, mojo::Array<uint8_t>());
     return;
@@ skipping 76 matching lines @@
   if (!base_file.IsValid()) {
     *error = GetError(base_file);
     return mojo::ScopedHandle();
   }
 
   *error = mojom::FileError::OK;
   return mojo::WrapPlatformFile(base_file.TakePlatformFile());
 }
 
 }  // namespace filesystem