Commit 5e2b6fd7 authored by Kunihiko Sakamoto's avatar Kunihiko Sakamoto Committed by Commit Bot

Treat content:// URL scheme as local in content shell on Android

This fixes an issue that content:// URLs behaves differently from
file:// URLs in tests.

Bug: 1136315
Change-Id: Idf5311ea36c07a739ef6025023675e5a8000cdec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2462898Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Kunihiko Sakamoto <ksakamoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816448}
parent 7c2d94ef
......@@ -67,4 +67,10 @@ blink::OriginTrialPolicy* ShellContentClient::GetOriginTrialPolicy() {
return &origin_trial_policy_;
}
void ShellContentClient::AddAdditionalSchemes(Schemes* schemes) {
#if defined(OS_ANDROID)
schemes->local_schemes.push_back(url::kContentScheme);
#endif
}
} // namespace content
......@@ -25,6 +25,7 @@ class ShellContentClient : public ContentClient {
base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
gfx::Image& GetNativeImageNamed(int resource_id) override;
blink::OriginTrialPolicy* GetOriginTrialPolicy() override;
void AddAdditionalSchemes(Schemes* schemes) override;
private:
ShellOriginTrialPolicy origin_trial_policy_;
......
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