Restore KeyedServiceFactory diagnostics for context use-after-destroy.

components/keyed_service/content/browser_context_keyed_service_factory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/keyed_service/core/keyed_service.h"
@@ skipping 30 matching lines @@
 
 KeyedService* BrowserContextKeyedServiceFactory::GetServiceForBrowserContext(
     content::BrowserContext* context,
     bool create) {
   return KeyedServiceFactory::GetServiceForContext(context, create);
 }
 
 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;
 
   return context;
 }
 
 void
 BrowserContextKeyedServiceFactory::RegisterUserPrefsOnBrowserContextForTest(
     content::BrowserContext* context) {
@@ skipping 28 matching lines @@
       BuildServiceInstanceFor(static_cast<content::BrowserContext*>(context)));
 }
 
 bool BrowserContextKeyedServiceFactory::IsOffTheRecord(
     base::SupportsUserData* context) const {
   return static_cast<content::BrowserContext*>(context)->IsOffTheRecord();
 }
 
 base::SupportsUserData* BrowserContextKeyedServiceFactory::GetContextToUse(
     base::SupportsUserData* context) const {
+  AssertContextWasntDestroyed(context);
   return GetBrowserContextToUse(static_cast<content::BrowserContext*>(context));
 }
 
 bool BrowserContextKeyedServiceFactory::ServiceIsCreatedWithContext() const {
   return ServiceIsCreatedWithBrowserContext();
 }
 
 void BrowserContextKeyedServiceFactory::ContextShutdown(
     base::SupportsUserData* context) {
   BrowserContextShutdown(static_cast<content::BrowserContext*>(context));
 }
 
 void BrowserContextKeyedServiceFactory::ContextDestroyed(
     base::SupportsUserData* context) {
   BrowserContextDestroyed(static_cast<content::BrowserContext*>(context));
 }
 
 void BrowserContextKeyedServiceFactory::RegisterPrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   RegisterProfilePrefs(registry);
 }