Commit b8c0b1cc authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

Clean up old Mojo type for mojom::BlobURLStore

This CL cleans up old mojo types for mojom::BlobURLStore
using SelfOwnedAssociatedReceiverRef instead of
StrongAssociatedBindingPtr.

Bug: 955171
Change-Id: I5069e33e5397da53cee6138ad070de1d5bc54619
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1886550Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#710568}
parent a9ee3ee8
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "content/public/test/browser_test_utils.h" #include "content/public/test/browser_test_utils.h"
#include "extensions/common/extension_urls.h" #include "extensions/common/extension_urls.h"
#include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/strong_associated_binding.h" #include "mojo/public/cpp/bindings/self_owned_associated_receiver.h"
#include "net/dns/mock_host_resolver.h" #include "net/dns/mock_host_resolver.h"
#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
#include "storage/browser/blob/blob_registry_impl.h" #include "storage/browser/blob/blob_registry_impl.h"
...@@ -411,11 +411,12 @@ class BlobURLStoreInterceptor ...@@ -411,11 +411,12 @@ class BlobURLStoreInterceptor
public: public:
static void Intercept( static void Intercept(
GURL target_url, GURL target_url,
mojo::StrongAssociatedBindingPtr<blink::mojom::BlobURLStore> binding) { mojo::SelfOwnedAssociatedReceiverRef<blink::mojom::BlobURLStore>
receiver) {
auto interceptor = auto interceptor =
base::WrapUnique(new BlobURLStoreInterceptor(target_url)); base::WrapUnique(new BlobURLStoreInterceptor(target_url));
auto* raw_interceptor = interceptor.get(); auto* raw_interceptor = interceptor.get();
auto impl = binding->SwapImplForTesting(std::move(interceptor)); auto impl = receiver->SwapImplForTesting(std::move(interceptor));
raw_interceptor->url_store_ = std::move(impl); raw_interceptor->url_store_ = std::move(impl);
} }
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
#include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h" #include "mojo/public/cpp/bindings/remote.h"
#include "mojo/public/cpp/bindings/strong_associated_binding.h" #include "mojo/public/cpp/bindings/self_owned_associated_receiver.h"
#include "mojo/public/cpp/test_support/test_utils.h" #include "mojo/public/cpp/test_support/test_utils.h"
#include "net/base/filename_util.h" #include "net/base/filename_util.h"
#include "net/base/network_isolation_key.h" #include "net/base/network_isolation_key.h"
...@@ -198,11 +198,12 @@ class BlobURLStoreInterceptor ...@@ -198,11 +198,12 @@ class BlobURLStoreInterceptor
public: public:
static void Intercept( static void Intercept(
GURL target_url, GURL target_url,
mojo::StrongAssociatedBindingPtr<blink::mojom::BlobURLStore> binding) { mojo::SelfOwnedAssociatedReceiverRef<blink::mojom::BlobURLStore>
receiver) {
auto interceptor = auto interceptor =
base::WrapUnique(new BlobURLStoreInterceptor(target_url)); base::WrapUnique(new BlobURLStoreInterceptor(target_url));
auto* raw_interceptor = interceptor.get(); auto* raw_interceptor = interceptor.get();
auto impl = binding->SwapImplForTesting(std::move(interceptor)); auto impl = receiver->SwapImplForTesting(std::move(interceptor));
raw_interceptor->url_store_ = std::move(impl); raw_interceptor->url_store_ = std::move(impl);
} }
......
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