| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 8ea4bb12aade5984c278edfbd451a37fde8103f0..dfe477c22b0db1f33ac65a3fc84e0b56f9e11d1e 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -1331,7 +1331,7 @@ void RenderThreadImpl::InitializeWebKit(
|
|
|
| void RenderThreadImpl::RegisterSchemes() {
|
| // chrome:
|
| - WebString chrome_scheme(base::ASCIIToUTF16(kChromeUIScheme));
|
| + WebString chrome_scheme(WebString::fromASCII(kChromeUIScheme));
|
| WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_scheme);
|
| WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs(
|
| chrome_scheme);
|
| @@ -1339,11 +1339,11 @@ void RenderThreadImpl::RegisterSchemes() {
|
| WebSecurityPolicy::registerURLSchemeAsCORSEnabled(chrome_scheme);
|
|
|
| // chrome-devtools:
|
| - WebString devtools_scheme(base::ASCIIToUTF16(kChromeDevToolsScheme));
|
| + WebString devtools_scheme(WebString::fromASCII(kChromeDevToolsScheme));
|
| WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(devtools_scheme);
|
|
|
| // view-source:
|
| - WebString view_source_scheme(base::ASCIIToUTF16(kViewSourceScheme));
|
| + WebString view_source_scheme(WebString::fromASCII(kViewSourceScheme));
|
| WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(view_source_scheme);
|
| }
|
|
|
|
|