Chromium Code Reviews| Index: chrome/browser/net/chrome_extensions_network_delegate.cc |
| diff --git a/chrome/browser/net/chrome_extensions_network_delegate.cc b/chrome/browser/net/chrome_extensions_network_delegate.cc |
| index 86161ddd9ee9c5b4466d1aa6b27ea11736962ac7..830d4927cc1d16ab9a93b10f72a5a0d9fbe8b2db 100644 |
| --- a/chrome/browser/net/chrome_extensions_network_delegate.cc |
| +++ b/chrome/browser/net/chrome_extensions_network_delegate.cc |
| @@ -173,7 +173,7 @@ int ChromeExtensionsNetworkDelegateImpl::OnBeforeURLRequest( |
| GURL* new_url) { |
| const content::ResourceRequestInfo* info = |
| content::ResourceRequestInfo::ForRequest(request); |
| - GURL url(request->url()); |
| + const GURL& url(request->url()); |
| // Block top-level navigations to blob: or filesystem: URLs with extension |
| // origin from non-extension processes. See https://crbug.com/645028. |
| @@ -188,9 +188,9 @@ int ChromeExtensionsNetworkDelegateImpl::OnBeforeURLRequest( |
| bool is_nested_url = url.SchemeIsFileSystem() || url.SchemeIsBlob(); |
| bool is_navigation = |
| info && content::IsResourceTypeFrame(info->GetResourceType()); |
| - url::Origin origin(url); |
| + url::Origin origin; |
| if (is_nested_url && is_navigation && info->IsMainFrame() && |
| - origin.scheme() == extensions::kExtensionScheme && |
| + (origin = url::Origin(url)).scheme() == extensions::kExtensionScheme && |
|
Randy Smith (Not in Mondays)
2016/12/06 16:09:20
Suggestion: I understand why you're doing this, an
Charlie Harrison
2016/12/06 18:23:38
Moved it to a nested conditional and added a justi
|
| !extension_info_map_->process_map().Contains(info->GetChildID()) && |
| !content::IsBrowserSideNavigationEnabled()) { |
| // Relax this restriction for apps that use <webview>. See |