| Index: chrome/renderer/extensions/resource_request_policy.cc
|
| diff --git a/chrome/renderer/extensions/resource_request_policy.cc b/chrome/renderer/extensions/resource_request_policy.cc
|
| index 26250fd733c4db30de6ff74b2e3165f2f8138c66..b426f0911b67bf93811e94435bd3d9816f849fed 100644
|
| --- a/chrome/renderer/extensions/resource_request_policy.cc
|
| +++ b/chrome/renderer/extensions/resource_request_policy.cc
|
| @@ -18,6 +18,7 @@
|
| #include "extensions/renderer/renderer_extension_registry.h"
|
| #include "third_party/WebKit/public/platform/URLConversion.h"
|
| #include "third_party/WebKit/public/platform/WebString.h"
|
| +#include "third_party/WebKit/public/platform/WebURL.h"
|
| #include "third_party/WebKit/public/web/WebConsoleMessage.h"
|
| #include "third_party/WebKit/public/web/WebDocument.h"
|
| #include "third_party/WebKit/public/web/WebFrame.h"
|
| @@ -114,16 +115,16 @@ bool ResourceRequestPolicy::CanRequestResource(
|
| }
|
|
|
| bool ResourceRequestPolicy::CanRequestExtensionResourceScheme(
|
| - const GURL& resource_url,
|
| + const blink::WebURL& resource_url,
|
| blink::WebFrame* frame) {
|
| - CHECK(resource_url.SchemeIs(kExtensionResourceScheme));
|
| + CHECK(resource_url.protocolIs(kExtensionResourceScheme));
|
|
|
| GURL frame_url = frame->document().url();
|
| if (!frame_url.is_empty() && !frame_url.SchemeIs(kExtensionScheme)) {
|
| std::string message = base::StringPrintf(
|
| "Denying load of %s. chrome-extension-resources:// can only be "
|
| "loaded from extensions.",
|
| - resource_url.spec().c_str());
|
| + resource_url.string().utf8().c_str());
|
| frame->addMessageToConsole(
|
| blink::WebConsoleMessage(blink::WebConsoleMessage::LevelError,
|
| blink::WebString::fromUTF8(message)));
|
|
|