diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc index db99f2296325c..7944f63614749 100644 --- a/components/content_settings/core/browser/host_content_settings_map.cc +++ b/components/content_settings/core/browser/host_content_settings_map.cc @@ -954,6 +954,10 @@ base::Value HostContentSettingsMap::GetContentSettingValueAndPatterns( ContentSettingsPattern* primary_pattern, ContentSettingsPattern* secondary_pattern, content_settings::SessionModel* session_model) { + // TODO(crbug.com/1336617): Remove this check once we figure out what is + // wrong. + CHECK(provider); + if (include_incognito) { // Check incognito-only specific settings. It's essential that the // |RuleIterator| gets out of scope before we get a rule iterator for the diff --git a/components/embedder_support/content_settings_utils.cc b/components/embedder_support/content_settings_utils.cc index 7ff1e66751633..9d43e5a9dfdf6 100644 --- a/components/embedder_support/content_settings_utils.cc +++ b/components/embedder_support/content_settings_utils.cc @@ -8,6 +8,7 @@ #include "components/content_settings/core/browser/cookie_settings.h" #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_utils.h" +#include "content/public/browser/browser_thread.h" #include "net/cookies/site_for_cookies.h" #include "url/gurl.h" #include "url/origin.h" @@ -43,6 +44,10 @@ content::AllowServiceWorkerResult AllowServiceWorker( const absl::optional& top_frame_origin, const content_settings::CookieSettings* cookie_settings, const HostContentSettingsMap* settings_map) { + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); + // TODO(crbug.com/1336617): Remove this check once we figure out what is + // wrong. + DCHECK(settings_map); GURL first_party_url = top_frame_origin ? top_frame_origin->GetURL() : GURL(); // Check if JavaScript is allowed. content_settings::SettingInfo info; diff --git a/weblayer/browser/content_browser_client_impl.cc b/weblayer/browser/content_browser_client_impl.cc index 636dd9c44b228..2f24cb0e0dbff 100644 --- a/weblayer/browser/content_browser_client_impl.cc +++ b/weblayer/browser/content_browser_client_impl.cc @@ -336,6 +336,7 @@ content::AllowServiceWorkerResult ContentBrowserClientImpl::AllowServiceWorker( const absl::optional& top_frame_origin, const GURL& script_url, content::BrowserContext* context) { + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); return embedder_support::AllowServiceWorker( scope, site_for_cookies, top_frame_origin, CookieSettingsFactory::GetForBrowserContext(context).get(),