Commit 8c9e72f3 authored by Henrique Ferreiro's avatar Henrique Ferreiro Committed by Commit Bot

Migrate file_utilities.mojom to the new Mojo types

Convert the implementation and all users of the
blink::mojom::FileUtilitiesHost interface to the new Mojo types.

Bug: 955171, 978694
Change-Id: Ifc340e266f28c4a8122b54302824257b8cfe887c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1787387Reviewed-by: default avatarOksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: default avatarJochen Eisinger <jochen@chromium.org>
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Cr-Commit-Position: refs/heads/master@{#696008}
parent b0784c2f
......@@ -4,12 +4,14 @@
#include "content/browser/renderer_host/file_utilities_host_impl.h"
#include <memory>
#include <utility>
#include "base/files/file_util.h"
#include "base/optional.h"
#include "content/browser/child_process_security_policy_impl.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/self_owned_receiver.h"
namespace content {
......@@ -20,9 +22,9 @@ FileUtilitiesHostImpl::~FileUtilitiesHostImpl() = default;
void FileUtilitiesHostImpl::Create(
int process_id,
blink::mojom::FileUtilitiesHostRequest request) {
mojo::MakeStrongBinding(std::make_unique<FileUtilitiesHostImpl>(process_id),
std::move(request));
mojo::PendingReceiver<blink::mojom::FileUtilitiesHost> receiver) {
mojo::MakeSelfOwnedReceiver(
std::make_unique<FileUtilitiesHostImpl>(process_id), std::move(receiver));
}
void FileUtilitiesHostImpl::GetFileInfo(const base::FilePath& path,
......
......@@ -5,6 +5,7 @@
#ifndef CONTENT_BROWSER_RENDERER_HOST_FILE_UTILITIES_HOST_IMPL_H_
#define CONTENT_BROWSER_RENDERER_HOST_FILE_UTILITIES_HOST_IMPL_H_
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "third_party/blink/public/mojom/file/file_utilities.mojom.h"
namespace content {
......@@ -14,8 +15,9 @@ class FileUtilitiesHostImpl : public blink::mojom::FileUtilitiesHost {
explicit FileUtilitiesHostImpl(int process_id);
~FileUtilitiesHostImpl() override;
static void Create(int process_id,
blink::mojom::FileUtilitiesHostRequest request);
static void Create(
int process_id,
mojo::PendingReceiver<blink::mojom::FileUtilitiesHost> receiver);
private:
// blink::mojom::FileUtilitiesHost implementation.
......
......@@ -30,7 +30,11 @@
#include "third_party/blink/renderer/platform/file_metadata.h"
#include <limits>
#include <string>
#include "base/optional.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "net/base/filename_util.h"
#include "third_party/blink/public/mojom/file/file_utilities.mojom-blink.h"
#include "third_party/blink/public/platform/file_path_conversion.h"
......@@ -75,12 +79,12 @@ bool GetFileModificationTime(const String& path, double& result) {
bool GetFileMetadata(const String& path, FileMetadata& metadata) {
DEFINE_THREAD_SAFE_STATIC_LOCAL(
ThreadSpecific<mojom::blink::FileUtilitiesHostPtr>, thread_specific_host,
());
ThreadSpecific<mojo::Remote<mojom::blink::FileUtilitiesHost>>,
thread_specific_host, ());
auto& host = *thread_specific_host;
if (!host) {
Platform::Current()->GetInterfaceProvider()->GetInterface(
mojo::MakeRequest(&host));
host.BindNewPipeAndPassReceiver());
}
base::Optional<base::File::Info> file_info;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment