Restore KeyedServiceFactory diagnostics for context use-after-destroy.

components/keyed_service/content/browser_context_dependency_manager.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_CONTENT_BROWSER_CONTEXT_DEPENDENCY_MANAGER_H_
 #define COMPONENTS_KEYED_SERVICE_CONTENT_BROWSER_CONTEXT_DEPENDENCY_MANAGER_H_
 
 #include <memory>
 
 #include "base/callback_forward.h"
@@ skipping 50 matching lines @@
 
   // Registers a |callback| that will be called just before executing
   // CreateBrowserContextServices() or CreateBrowserContextServicesForTest().
   // This can be useful in browser tests which wish to substitute test or mock
   // builders for the keyed services.
   std::unique_ptr<
       base::CallbackList<void(content::BrowserContext*)>::Subscription>
   RegisterWillCreateBrowserContextServicesCallbackForTesting(
       const base::Callback<void(content::BrowserContext*)>& callback);
 
-#ifndef NDEBUG
-  // Debugging assertion called as part of GetServiceForBrowserContext in debug
-  // mode. This will NOTREACHED() whenever the user is trying to access a stale
-  // BrowserContext*.
-  void AssertBrowserContextWasntDestroyed(content::BrowserContext* context);
+  // Runtime assertion called as a part of GetServiceForBrowserContext() to
+  // check if |context| is considered stale. This will NOTREACHED() or
+  // base::debug::DumpWithoutCrashing() depending on the DCHECK_IS_ON() value.
+  void AssertBrowserContextWasntDestroyed(
+      content::BrowserContext* context) const;
 
   // Marks |context| as live (i.e., not stale). This method can be called as a
   // safeguard against |AssertBrowserContextWasntDestroyed()| checks going off
-  // due to |context| aliasing a BrowserContext instance from a prior test
-  // (i.e., 0xWhatever might be created, be destroyed, and then a new
-  // BrowserContext object might be created at 0xWhatever).
-  void MarkBrowserContextLiveForTesting(content::BrowserContext* context);
-#endif  // NDEBUG
+  // due to |context| aliasing a BrowserContext instance from a prior
+  // construction (i.e., 0xWhatever might be created, be destroyed, and then a
+  // new BrowserContext object might be created at 0xWhatever).
+  void MarkBrowserContextLive(content::BrowserContext* context);
 
   static BrowserContextDependencyManager* GetInstance();
 
  private:
   friend class BrowserContextDependencyManagerUnittests;
   friend struct base::DefaultSingletonTraits<BrowserContextDependencyManager>;
 
   // Helper function used by CreateBrowserContextServices[ForTest].
   void DoCreateBrowserContextServices(content::BrowserContext* context,
                                       bool is_testing_context);
 
   BrowserContextDependencyManager();
   ~BrowserContextDependencyManager() override;
 
 #ifndef NDEBUG
   // DependencyManager:
   void DumpContextDependencies(base::SupportsUserData* context) const final;
 #endif  // NDEBUG
 
   // A list of callbacks to call just before executing
   // CreateBrowserContextServices() or CreateBrowserContextServicesForTest().
   base::CallbackList<void(content::BrowserContext*)>
       will_create_browser_context_services_callbacks_;
 };
 
 #endif  // COMPONENTS_KEYED_SERVICE_CONTENT_BROWSER_CONTEXT_DEPENDENCY_MANAGER_H_