Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(699)

Unified Diff: components/keyed_service/ios/browser_state_keyed_service_factory.cc

Issue 2749823002: Restore KeyedServiceFactory diagnostics for context use-after-destroy. (Closed)
Patch Set: Refactor SiteEngagementService tests. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/keyed_service/ios/browser_state_keyed_service_factory.cc
diff --git a/components/keyed_service/ios/browser_state_keyed_service_factory.cc b/components/keyed_service/ios/browser_state_keyed_service_factory.cc
index a981c3d83dbefe8cfd449dca5bd34bb0579a5632..105e6992ce4b7a681dbe3a44c9d363d8cc9b8051 100644
--- a/components/keyed_service/ios/browser_state_keyed_service_factory.cc
+++ b/components/keyed_service/ios/browser_state_keyed_service_factory.cc
@@ -42,12 +42,9 @@ KeyedService* BrowserStateKeyedServiceFactory::GetServiceForBrowserState(
web::BrowserState* BrowserStateKeyedServiceFactory::GetBrowserStateToUse(
web::BrowserState* context) const {
+ // TODO(crbug.com/701326): This DCHECK should be moved to GetContextToUse().
DCHECK(CalledOnValidThread());
-#ifndef NDEBUG
- AssertContextWasntDestroyed(context);
-#endif
-
// Safe default for Incognito mode: no service.
if (context->IsOffTheRecord())
return nullptr;
@@ -86,6 +83,7 @@ bool BrowserStateKeyedServiceFactory::IsOffTheRecord(
base::SupportsUserData* BrowserStateKeyedServiceFactory::GetContextToUse(
base::SupportsUserData* context) const {
+ AssertContextWasntDestroyed(context);
return GetBrowserStateToUse(static_cast<web::BrowserState*>(context));
}

Powered by Google App Engine
This is Rietveld 408576698