| Index: chrome/browser/extensions/chrome_extensions_browser_client.cc
|
| diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
|
| index 12219a55d58ee119b31a540eb5371b7449ae9a5b..ff8c619816f2c5927cd9acbc1797cc816206a61f 100644
|
| --- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
|
| +++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
|
| @@ -37,6 +37,7 @@
|
| #include "extensions/browser/extension_function_registry.h"
|
| #include "extensions/browser/extension_prefs.h"
|
| #include "extensions/browser/pref_names.h"
|
| +#include "extensions/browser/url_request_util.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "chromeos/chromeos_switches.h"
|
| @@ -138,8 +139,13 @@ bool ChromeExtensionsBrowserClient::AllowCrossRendererResourceLoad(
|
| bool is_incognito,
|
| const Extension* extension,
|
| InfoMap* extension_info_map) {
|
| - return url_request_util::AllowCrossRendererResourceLoad(
|
| - request, is_incognito, extension, extension_info_map);
|
| + bool allowed = false;
|
| + if (url_request_util::ChromeAllowCrossRendererResourceLoad(
|
| + request, is_incognito, extension, extension_info_map, &allowed))
|
| + return allowed;
|
| +
|
| + // Couldn't determine if resource is allowed. Block the load.
|
| + return false;
|
| }
|
|
|
| PrefService* ChromeExtensionsBrowserClient::GetPrefServiceForContext(
|
|
|