Restore KeyedServiceFactory diagnostics for context use-after-destroy.

components/keyed_service/content/browser_context_dependency_manager.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_dependency_manager.h"
 
 #include "base/memory/singleton.h"
 #include "base/trace_event/trace_event.h"
 #include "content/public/browser/browser_context.h"
 
@@ skipping 42 matching lines @@
 }
 
 std::unique_ptr<
     base::CallbackList<void(content::BrowserContext*)>::Subscription>
 BrowserContextDependencyManager::
     RegisterWillCreateBrowserContextServicesCallbackForTesting(
         const base::Callback<void(content::BrowserContext*)>& callback) {
   return will_create_browser_context_services_callbacks_.Add(callback);
 }
 
-#ifndef NDEBUG
 void BrowserContextDependencyManager::AssertBrowserContextWasntDestroyed(
-    content::BrowserContext* context) {
+    content::BrowserContext* context) const {
   DependencyManager::AssertContextWasntDestroyed(context);
 }
 
-void BrowserContextDependencyManager::MarkBrowserContextLiveForTesting(
+void BrowserContextDependencyManager::MarkBrowserContextLive(
     content::BrowserContext* context) {
-  DependencyManager::MarkContextLiveForTesting(context);
+  DependencyManager::MarkContextLive(context);
 }
-#endif  // NDEBUG
 
 // static
 BrowserContextDependencyManager*
 BrowserContextDependencyManager::GetInstance() {
   return base::Singleton<BrowserContextDependencyManager>::get();
 }
 
 BrowserContextDependencyManager::BrowserContextDependencyManager() {
 }
 
 BrowserContextDependencyManager::~BrowserContextDependencyManager() {
 }
 
 #ifndef NDEBUG
 void BrowserContextDependencyManager::DumpContextDependencies(
     base::SupportsUserData* context) const {
   // Whenever we try to build a destruction ordering, we should also dump a
   // dependency graph to "/path/to/context/context-dependencies.dot".
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           kDumpBrowserContextDependencyGraphFlag)) {
     base::FilePath dot_file =
         static_cast<const content::BrowserContext*>(context)
             ->GetPath()
             .AppendASCII("browser-context-dependencies.dot");
     DumpDependenciesAsGraphviz("BrowserContext", dot_file);
   }
 }
 #endif  // NDEBUG