Chromium Code Reviews| Index: chrome/renderer/extensions/extension_dispatcher.cc |
| diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc |
| index 23c57e46c3f9e365fbdd7f291a281bea697cb7b0..6a98a2a1c0043ef02b7df4cf88577e93c7ed7240 100644 |
| --- a/chrome/renderer/extensions/extension_dispatcher.cc |
| +++ b/chrome/renderer/extensions/extension_dispatcher.cc |
| @@ -328,18 +328,8 @@ bool ExtensionDispatcher::AllowScriptExtension( |
| if (!custom_binding_api_name.empty()) { |
| std::string extension_id = GetExtensionID(frame, world_id); |
| const Extension* extension = extensions_.GetByID(extension_id); |
| - if (!extension) { |
| - // This can happen when a resource is blocked due to CSP; a valid |
| - // chrome-extension:// URL is navigated to, so it passes the initial |
| - // checks, but the URL gets changed to "chrome-extension://invalid" |
| - // afterwards (see chrome_content_renderer_client.cc). An extension |
| - // page still gets loaded, just for the extension with ID "invalid", |
| - // which of course isn't found so GetById extension will be NULL. |
| - // |
| - // Reference: http://crbug.com/111614. |
| - CHECK_EQ("invalid", extension_id); |
|
Aaron Boodman
2012/03/16 03:48:28
Can you LOG(ERROR) the details? This seems weird,
not at google - send to devlin
2012/03/16 04:54:46
Done.
|
| + if (!extension) |
| return false; |
| - } |
| return util::AllowAPIInjection(custom_binding_api_name, *extension, this); |
| } |