Restore KeyedServiceFactory diagnostics for context use-after-destroy.

components/keyed_service/core/keyed_service_base_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/core/keyed_service_base_factory.h"
 
 #include "base/supports_user_data.h"
 #include "base/trace_event/trace_event.h"
 #include "components/keyed_service/core/dependency_manager.h"
 #include "components/pref_registry/pref_registry_syncable.h"
@@ skipping 61 matching lines @@
 user_prefs::PrefRegistrySyncable*
 KeyedServiceBaseFactory::GetAssociatedPrefRegistry(
     base::SupportsUserData* context) const {
   PrefService* prefs = user_prefs::UserPrefs::Get(context);
   user_prefs::PrefRegistrySyncable* registry =
       static_cast<user_prefs::PrefRegistrySyncable*>(
           prefs->DeprecatedGetPrefRegistry());
   return registry;
 }
 
-#ifndef NDEBUG
 void KeyedServiceBaseFactory::AssertContextWasntDestroyed(
     base::SupportsUserData* context) const {
-  DCHECK(CalledOnValidThread());
+  // TODO(crbug.com/701326): We should DCHECK(CalledOnValidThread()) here, but

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

Could you explain more why this wasn't detected earlier?

[sense (YandexTeam), 2017/03/22 07:38:21]

This wasn't called if GetBrowserContextToUse() in the user factory was
overriden.

+  // currently some code doesn't do service getting on the main thread.
+  // This needs to be fixed and DCHECK should be restored here.
   dependency_manager_->AssertContextWasntDestroyed(context);
 }
 
-void KeyedServiceBaseFactory::MarkContextLiveForTesting(
-    base::SupportsUserData* context) {
+void KeyedServiceBaseFactory::MarkContextLive(base::SupportsUserData* context) {
   DCHECK(CalledOnValidThread());
-  dependency_manager_->MarkContextLiveForTesting(context);
+  dependency_manager_->MarkContextLive(context);
 }
-#endif
 
 bool KeyedServiceBaseFactory::ServiceIsCreatedWithContext() const {
   return false;
 }
 
 bool KeyedServiceBaseFactory::ServiceIsNULLWhileTesting() const {
   return false;
 }
 
 void KeyedServiceBaseFactory::ContextDestroyed(
     base::SupportsUserData* context) {
   // While object destruction can be customized in ways where the object is
   // only dereferenced, this still must run on the UI thread.
   DCHECK(CalledOnValidThread());
   registered_preferences_.erase(context);
 }
 
 bool KeyedServiceBaseFactory::ArePreferencesSetOn(
     base::SupportsUserData* context) const {
   return registered_preferences_.find(context) != registered_preferences_.end();
 }
 
 void KeyedServiceBaseFactory::MarkPreferencesSetOn(
     base::SupportsUserData* context) {
   DCHECK(!ArePreferencesSetOn(context));
   registered_preferences_.insert(context);
 }