Commit 388ff964 authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

Clean up old Mojo types for network::mojom::URLLoaderFactory

This CL cleans up old Mojo types for network::mojom::URLLoaderFactory
using Remote.

Bug: 955171
Change-Id: I6dddbfd4358ac3b63ced2472a134bcd82dc6de2b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1946173
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: default avatarPeter Beverloo <peter@chromium.org>
Reviewed-by: default avatarTim Volodine <timvolodine@chromium.org>
Reviewed-by: default avatarDave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720471}
parent 02799897
......@@ -231,7 +231,7 @@ class MCSProbe {
std::unique_ptr<network::NetworkContext> network_context_;
mojo::Remote<network::mojom::NetworkContext> network_context_remote_;
network::mojom::URLLoaderFactoryPtr url_loader_factory_;
mojo::Remote<network::mojom::URLLoaderFactory> url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory_;
std::unique_ptr<base::RunLoop> run_loop_;
......@@ -371,7 +371,7 @@ void MCSProbe::InitializeNetworkState() {
url_loader_factory_params->process_id = network::mojom::kBrowserProcessId;
url_loader_factory_params->is_corb_enabled = false;
network_context_->CreateURLLoaderFactory(
mojo::MakeRequest(&url_loader_factory_),
url_loader_factory_.BindNewPipeAndPassReceiver(),
std::move(url_loader_factory_params));
shared_url_loader_factory_ =
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
......
......@@ -131,7 +131,7 @@ SafeBrowsingService::GetURLLoaderFactoryOnIOThread() {
FROM_HERE, {content::BrowserThread::UI},
base::BindOnce(&SafeBrowsingService::CreateURLLoaderFactoryForIO,
base::Unretained(this),
MakeRequest(&url_loader_factory_on_io_)));
url_loader_factory_on_io_.BindNewPipeAndPassReceiver()));
shared_url_loader_factory_on_io_ =
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
url_loader_factory_on_io_.get());
......
......@@ -8,6 +8,7 @@
#include "components/safe_browsing/base_ui_manager.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
#include "weblayer/browser/safe_browsing/safe_browsing_ui_manager.h"
......@@ -74,8 +75,8 @@ class SafeBrowsingService {
scoped_refptr<safe_browsing::RemoteSafeBrowsingDatabaseManager>
safe_browsing_db_manager_;
// A SharedURLLoaderFactory and its interfaceptr used on the IO thread.
network::mojom::URLLoaderFactoryPtr url_loader_factory_on_io_;
// A SharedURLLoaderFactory and its remote used on the IO thread.
mojo::Remote<network::mojom::URLLoaderFactory> url_loader_factory_on_io_;
scoped_refptr<network::WeakWrapperSharedURLLoaderFactory>
shared_url_loader_factory_on_io_;
......
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