| Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
|
| diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
|
| index efe454266667b655755b944ea31de7b20afbdf5a..7c121f5c484a7883cefacb5cccffe7785ec40079 100644
|
| --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
|
| +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
|
| @@ -64,7 +64,9 @@
|
| #include "content/public/browser/service_worker_context.h"
|
| #include "content/public/browser/stream_info.h"
|
| #include "content/public/browser/web_contents.h"
|
| +#include "content/public/common/browser_side_navigation_policy.h"
|
| #include "content/public/common/resource_response.h"
|
| +#include "content/public/common/resource_type.h"
|
| #include "net/base/load_flags.h"
|
| #include "net/base/load_timing_info.h"
|
| #include "net/base/request_priority.h"
|
| @@ -606,7 +608,9 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(
|
| #endif // defined(OS_ANDROID)
|
|
|
| #if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
|
| - if (!first_throttle && io_data->safe_browsing_enabled()->GetValue()) {
|
| + if (!first_throttle && io_data->safe_browsing_enabled()->GetValue() &&
|
| + (!content::IsBrowserSideNavigationEnabled() ||
|
| + !content::IsResourceTypeFrame(resource_type))) {
|
| first_throttle = SafeBrowsingResourceThrottle::MaybeCreate(
|
| request, resource_type, safe_browsing_.get());
|
| }
|
|
|