summaryrefslogtreecommitdiff
path: root/chromium/extensions/browser/extension_navigation_throttle.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/extensions/browser/extension_navigation_throttle.cc
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/extensions/browser/extension_navigation_throttle.cc')
-rw-r--r--chromium/extensions/browser/extension_navigation_throttle.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/chromium/extensions/browser/extension_navigation_throttle.cc b/chromium/extensions/browser/extension_navigation_throttle.cc
index 8b046da23ad..40f245e8adf 100644
--- a/chromium/extensions/browser/extension_navigation_throttle.cc
+++ b/chromium/extensions/browser/extension_navigation_throttle.cc
@@ -10,6 +10,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/navigation_handle.h"
#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/storage_partition_config.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/url_constants.h"
#include "extensions/browser/extension_registry.h"
@@ -107,16 +108,16 @@ ExtensionNavigationThrottle::WillStartOrRedirectRequest() {
const Extension* owner_extension =
registry->enabled_extensions().GetByID(owner_extension_id);
- std::string partition_domain;
- std::string partition_id;
- bool in_memory = false;
+ content::StoragePartitionConfig storage_partition_config =
+ content::StoragePartitionConfig::CreateDefault();
bool is_guest = WebViewGuest::GetGuestPartitionConfigForSite(
navigation_handle()->GetStartingSiteInstance()->GetSiteURL(),
- &partition_domain, &partition_id, &in_memory);
+ &storage_partition_config);
bool allowed = true;
url_request_util::AllowCrossRendererResourceLoadHelper(
- is_guest, target_extension, owner_extension, partition_id, url.path(),
+ is_guest, target_extension, owner_extension,
+ storage_partition_config.partition_name(), url.path(),
navigation_handle()->GetPageTransition(), &allowed);
if (!allowed)
return content::NavigationThrottle::BLOCK_REQUEST;