Restore KeyedServiceFactory diagnostics for context use-after-destroy.

components/keyed_service/content/browser_context_keyed_service_factory.cc

Index: components/keyed_service/content/browser_context_keyed_service_factory.cc
diff --git a/components/keyed_service/content/browser_context_keyed_service_factory.cc b/components/keyed_service/content/browser_context_keyed_service_factory.cc
index f008d176167e344e8023d87629c72b957b2d2c80..38f6ca6158a4314adcaaa3cef11387b6cae12993 100644
--- a/components/keyed_service/content/browser_context_keyed_service_factory.cc
+++ b/components/keyed_service/content/browser_context_keyed_service_factory.cc
@@ -48,12 +48,9 @@ KeyedService* BrowserContextKeyedServiceFactory::GetServiceForBrowserContext(
 content::BrowserContext*
 BrowserContextKeyedServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
+  // TODO(crbug.com/701326): This DCHECK should be moved to GetContextToUse().
   DCHECK(CalledOnValidThread());
 
-#ifndef NDEBUG
-  AssertContextWasntDestroyed(context);

[Paweł Hajdan Jr., 2017/03/21 13:03:24]

Why do we remove this assertion?

-#endif
-
   // Safe default for Incognito mode: no service.
   if (context->IsOffTheRecord())
     return nullptr;
@@ -102,6 +99,7 @@ bool BrowserContextKeyedServiceFactory::IsOffTheRecord(
 
 base::SupportsUserData* BrowserContextKeyedServiceFactory::GetContextToUse(
     base::SupportsUserData* context) const {
+  AssertContextWasntDestroyed(context);
   return GetBrowserContextToUse(static_cast<content::BrowserContext*>(context));
 }