Commit 13251e5e authored by Daniel Cheng's avatar Daniel Cheng Committed by Commit Bot

Clean up miscellaneous usage of raw message pipes for BlobURLToken

BlobURLToken was passed as a raw message pipe due to legacy IPC, but
OpenURL() has since been migrated to Mojo.

Bug: 1093920
Change-Id: Ie5f3213010b43b11a4b3327b7e531afe8965a84d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2559800Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#831050}
parent b2cf6bb4
......@@ -31,7 +31,7 @@ bool VerifyBlobToken(
const GURL& received_url) {
DCHECK_NE(ChildProcessHost::kInvalidUniqueID, process_id);
if (received_token) {
if (received_token.is_valid()) {
if (!received_url.SchemeIsBlob()) {
bad_message::ReceivedBadMessage(
process_id, bad_message::BLOB_URL_TOKEN_FOR_NON_BLOB_URL);
......@@ -111,18 +111,15 @@ bool VerifyOpenURLParams(SiteInstance* site_instance,
process->FilterURL(false, out_validated_url);
// Verify |params.blob_url_token| and populate |out_blob_url_loader_factory|.
mojo::PendingRemote<blink::mojom::BlobURLToken> blob_url_token(
mojo::ScopedMessagePipeHandle(std::move(params->blob_url_token)),
blink::mojom::BlobURLToken::Version_);
if (!VerifyBlobToken(process_id, blob_url_token, params->url))
if (!VerifyBlobToken(process_id, params->blob_url_token, params->url))
return false;
if (blob_url_token.is_valid()) {
if (params->blob_url_token.is_valid()) {
*out_blob_url_loader_factory =
ChromeBlobStorageContext::URLLoaderFactoryForToken(
BrowserContext::GetStoragePartition(
site_instance->GetBrowserContext(), site_instance),
std::move(blob_url_token));
std::move(params->blob_url_token));
}
// Verify |params.post_body|.
......
......@@ -372,7 +372,7 @@ struct OpenURLParams {
// Extra information about the triggering of the OpenURL.
TriggeringEventInfo triggering_event_info;
handle<message_pipe>? blob_url_token;
pending_remote<blink.mojom.BlobURLToken>? blob_url_token;
string href_translate;
Impression? impression;
NavigationDownloadPolicy download_policy;
......
......@@ -5771,7 +5771,7 @@ void RenderFrameImpl::OpenURL(std::unique_ptr<blink::WebNavigationInfo> info) {
info->url_request.GetReferrerPolicy());
params->disposition = RenderViewImpl::NavigationPolicyToDisposition(policy);
params->triggering_event_info = info->triggering_event_info;
params->blob_url_token = CloneBlobURLToken(info->blob_url_token).PassPipe();
params->blob_url_token = CloneBlobURLToken(info->blob_url_token);
params->should_replace_current_entry =
info->frame_load_type == WebFrameLoadType::kReplaceCurrentItem &&
render_view_->history_list_length_;
......
......@@ -621,9 +621,7 @@ void RenderFrameProxy::Navigate(
params->should_replace_current_entry = should_replace_current_entry;
params->user_gesture = request.HasUserGesture();
params->triggering_event_info = blink::TriggeringEventInfo::kUnknown;
params->blob_url_token =
mojo::PendingRemote<blink::mojom::BlobURLToken>(std::move(blob_url_token))
.PassPipe();
params->blob_url_token = std::move(blob_url_token);
RenderFrameImpl* initiator_render_frame =
RenderFrameImpl::FromWebFrame(initiator_frame);
......
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