Convert mojo::Binding<network::mojom::URLLoaderClient> to new Mojo types
This CL is a part of effort for converting mojom::URLLoaderClient
to new Mojo types.
It converts mojo::Binding<network::mojom::URLLoaderClient> to
mojo::Receiver<network::mojom::URLLoaderClient>.
On a follow-up CL, URLLoaderClientPtr will be handled with
new Mojo types.
Bug: 955171
Change-Id: Id297a6c86ea7b113d333d0ccb2a41611328c0aeb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1895107
Reviewed-by: Min Qin <[email protected]>
Reviewed-by: Luke Halliwell (slow) <[email protected]>
Reviewed-by: Matt Falkenhagen <[email protected]>
Reviewed-by: Bo <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: Ken Rockot <[email protected]>
Commit-Queue: Julie Kim <[email protected]>
Cr-Commit-Position: refs/heads/master@{#713720}
diff --git a/content/renderer/loader/navigation_body_loader.cc b/content/renderer/loader/navigation_body_loader.cc
index 09762f76..918f062 100644
--- a/content/renderer/loader/navigation_body_loader.cc
+++ b/content/renderer/loader/navigation_body_loader.cc
@@ -97,7 +97,6 @@
endpoints_(std::move(endpoints)),
task_runner_(std::move(task_runner)),
resource_load_info_(std::move(resource_load_info)),
- url_loader_client_binding_(this),
handle_watcher_(FROM_HERE,
mojo::SimpleWatcher::ArmingPolicy::MANUAL,
task_runner_) {}
@@ -220,9 +219,9 @@
void NavigationBodyLoader::BindURLLoaderAndContinue() {
url_loader_.Bind(std::move(endpoints_->url_loader), task_runner_);
- url_loader_client_binding_.Bind(std::move(endpoints_->url_loader_client),
- task_runner_);
- url_loader_client_binding_.set_connection_error_handler(base::BindOnce(
+ url_loader_client_receiver_.Bind(std::move(endpoints_->url_loader_client),
+ task_runner_);
+ url_loader_client_receiver_.set_disconnect_handler(base::BindOnce(
&NavigationBodyLoader::OnConnectionClosed, base::Unretained(this)));
}
diff --git a/content/renderer/loader/navigation_body_loader.h b/content/renderer/loader/navigation_body_loader.h
index 8780320..b053a8f8 100644
--- a/content/renderer/loader/navigation_body_loader.h
+++ b/content/renderer/loader/navigation_body_loader.h
@@ -18,7 +18,7 @@
#include "content/common/navigation_params.h"
#include "content/public/common/resource_load_info.mojom.h"
#include "mojo/public/cpp/base/big_buffer.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/system/data_pipe.h"
#include "mojo/public/cpp/system/simple_watcher.h"
#include "services/network/public/mojom/url_loader.mojom.h"
@@ -145,7 +145,8 @@
// These bindings are live while loading the response.
network::mojom::URLLoaderPtr url_loader_;
- mojo::Binding<network::mojom::URLLoaderClient> url_loader_client_binding_;
+ mojo::Receiver<network::mojom::URLLoaderClient> url_loader_client_receiver_{
+ this};
WebNavigationBodyLoader::Client* client_ = nullptr;
// The handle and watcher are live while loading the body.
diff --git a/content/renderer/loader/url_loader_client_impl.cc b/content/renderer/loader/url_loader_client_impl.cc
index 70d6e06..44fe52b2a 100644
--- a/content/renderer/loader/url_loader_client_impl.cc
+++ b/content/renderer/loader/url_loader_client_impl.cc
@@ -152,8 +152,7 @@
resource_dispatcher_(resource_dispatcher),
task_runner_(std::move(task_runner)),
bypass_redirect_checks_(bypass_redirect_checks),
- last_loaded_url_(request_url),
- url_loader_client_binding_(this) {}
+ last_loaded_url_(request_url) {}
URLLoaderClientImpl::~URLLoaderClientImpl() = default;
@@ -230,9 +229,9 @@
void URLLoaderClientImpl::Bind(
network::mojom::URLLoaderClientEndpointsPtr endpoints) {
url_loader_.Bind(std::move(endpoints->url_loader), task_runner_);
- url_loader_client_binding_.Bind(std::move(endpoints->url_loader_client),
- task_runner_);
- url_loader_client_binding_.set_connection_error_handler(base::BindOnce(
+ url_loader_client_receiver_.Bind(std::move(endpoints->url_loader_client),
+ task_runner_);
+ url_loader_client_receiver_.set_disconnect_handler(base::BindOnce(
&URLLoaderClientImpl::OnConnectionClosed, weak_factory_.GetWeakPtr()));
}
diff --git a/content/renderer/loader/url_loader_client_impl.h b/content/renderer/loader/url_loader_client_impl.h
index a940d61..b0b5ae98 100644
--- a/content/renderer/loader/url_loader_client_impl.h
+++ b/content/renderer/loader/url_loader_client_impl.h
@@ -11,7 +11,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "content/common/content_export.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/system/data_pipe.h"
#include "services/network/public/mojom/url_loader.mojom.h"
@@ -99,7 +99,8 @@
GURL last_loaded_url_;
network::mojom::URLLoaderPtr url_loader_;
- mojo::Binding<network::mojom::URLLoaderClient> url_loader_client_binding_;
+ mojo::Receiver<network::mojom::URLLoaderClient> url_loader_client_receiver_{
+ this};
base::WeakPtrFactory<URLLoaderClientImpl> weak_factory_{this};
};
