Restore KeyedServiceFactory diagnostics for context use-after-destroy.

components/keyed_service/ios/browser_state_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_IOS_BROWSER_STATE_DEPENDENCY_MANAGER_H_
 #define COMPONENTS_KEYED_SERVICE_IOS_BROWSER_STATE_DEPENDENCY_MANAGER_H_
 
 #include "base/callback_forward.h"
 #include "base/callback_list.h"
 #include "base/macros.h"
@@ skipping 38 matching lines @@
   // Similar to CreateBrowserStateServices(), except this is used for creating
   // test BrowserStates - these contexts will not create services for any
   // BrowserStateKeyedBaseFactories that return true from
   // ServiceIsNULLWhileTesting().
   void CreateBrowserStateServicesForTest(web::BrowserState* context);
 
   // Called by each BrowserState to alert us that we should destroy services
   // associated with it.
   void DestroyBrowserStateServices(web::BrowserState* context);
 
-#ifndef NDEBUG
-  // Debugging assertion called as part of GetServiceForBrowserState in debug
-  // mode. This will NOTREACHED() whenever the user is trying to access a stale
-  // BrowserState*.
-  void AssertBrowserStateWasntDestroyed(web::BrowserState* context);
+  // Runtime assertion called as a part of GetServiceForBrowserState() to check
+  // if |context| is considered stale. This will NOTREACHED() or
+  // base::debug::DumpWithoutCrashing() depending on the DCHECK_IS_ON() value.
+  void AssertBrowserStateWasntDestroyed(web::BrowserState* context) const;
 
   // Marks |context| as live (i.e., not stale). This method can be called as a
   // safeguard against |AssertBrowserStateWasntDestroyed()| checks going off
-  // due to |context| aliasing a BrowserState instance from a prior test
+  // due to |context| aliasing a BrowserState instance from a prior construction
   // (i.e., 0xWhatever might be created, be destroyed, and then a new
   // BrowserState object might be created at 0xWhatever).
-  void MarkBrowserStateLiveForTesting(web::BrowserState* context);
-#endif  // NDEBUG
+  void MarkBrowserStateLive(web::BrowserState* context);
 
  private:
   friend struct base::DefaultSingletonTraits<BrowserStateDependencyManager>;
 
   BrowserStateDependencyManager();
   ~BrowserStateDependencyManager() override;
 
   // Helper function used by CreateBrowserStateServices[ForTest].
   void DoCreateBrowserStateServices(web::BrowserState* context,
                                     bool is_testing_context);
 
 #ifndef NDEBUG
   // DependencyManager:
   void DumpContextDependencies(base::SupportsUserData* context) const final;
 #endif  // NDEBUG
 
   DISALLOW_COPY_AND_ASSIGN(BrowserStateDependencyManager);
 };
 
 #endif  // COMPONENTS_KEYED_SERVICE_IOS_BROWSER_STATE_DEPENDENCY_MANAGER_H_