Restore KeyedServiceFactory diagnostics for context use-after-destroy.

components/keyed_service/core/keyed_service_base_factory.h

 // 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.
 
 #ifndef COMPONENTS_KEYED_SERVICE_CORE_KEYED_SERVICE_BASE_FACTORY_H_
 #define COMPONENTS_KEYED_SERVICE_CORE_KEYED_SERVICE_BASE_FACTORY_H_
 
 #include <set>
 
 #include "base/threading/non_thread_safe.h"
@@ skipping 36 matching lines @@
   // |context|. Only test code is allowed to call this method.
   //
   // TODO(gab): This method can be removed entirely when
   // PrefService::DeprecatedGetPrefRegistry() is phased out.
   void RegisterUserPrefsOnContextForTest(base::SupportsUserData* context);
 
   // The main public interface for declaring dependencies between services
   // created by factories.
   void DependsOn(KeyedServiceBaseFactory* rhs);
 
-#ifndef NDEBUG
-  // Debugging assertion that will NOTREACHED() is |context| is considered
-  // stale. Should be used by subclasses when accessing |context|.
+  // Runtime assertion to check if |context| is considered stale. Should be used
+  // by subclasses when accessing |context|.
   void AssertContextWasntDestroyed(base::SupportsUserData* context) const;
 
   // Marks |context| as live (i.e., not stale). This method can be called as a
   // safeguard against |AssertContextWasntDestroyed()| checks going off due to
-  // |context| aliasing am instance from a prior test (i.e., 0xWhatever might
-  // be created, be destroyed, and then a new object might be created at
+  // |context| aliasing an instance from a prior construction (i.e., 0xWhatever
+  // might be created, be destroyed, and then a new object might be created at
   // 0xWhatever).
-  void MarkContextLiveForTesting(base::SupportsUserData* context);
-#endif
+  void MarkContextLive(base::SupportsUserData* context);
 
   // Calls RegisterProfilePrefs() after doing house keeping required to work
   // alongside RegisterUserPrefsOnContextForTest().
   // TODO(gab): This method can be replaced by RegisterProfilePrefs() directly
   // once RegisterUserPrefsOnContextForTest() is phased out.
   void RegisterPrefsIfNecessaryForContext(
       base::SupportsUserData* context,
       user_prefs::PrefRegistrySyncable* registry);
 
   // Returns the |user_pref::PrefRegistrySyncable| associated with |context|.
@@ skipping 60 matching lines @@
 
 #if !defined(NDEBUG)
   // A static string passed in to the constructor. Should be unique across all
   // services. This is used only for debugging in debug mode. (Used to print
   // pretty graphs with GraphViz.)
   const char* service_name_;
 #endif
 };
 
 #endif  // COMPONENTS_KEYED_SERVICE_CORE_KEYED_SERVICE_BASE_FACTORY_H_