Restore KeyedServiceFactory diagnostics for context use-after-destroy.

components/keyed_service/core/refcounted_keyed_service_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/refcounted_keyed_service_factory.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "components/keyed_service/core/dependency_manager.h"
 #include "components/keyed_service/core/refcounted_keyed_service.h"
@@ skipping 10 matching lines @@
 
 void RefcountedKeyedServiceFactory::SetTestingFactory(
     base::SupportsUserData* context,
     TestingFactoryFunction testing_factory) {
   // Destroying the context may cause us to lose data about whether |context|
   // has our preferences registered on it (since the context object itself
   // isn't dead). See if we need to readd it once we've gone through normal
   // destruction.
   bool add_context = ArePreferencesSetOn(context);
 
+  // Ensure that |context| is not marked as stale (e.g., due to it aliasing an
+  // instance that was destroyed in an earlier test) in order to avoid accesses
+  // to |context| in |ContextShutdown| from causing
+  // |AssertBrowserContextWasntDestroyed| to raise an error.
+  MarkContextLive(context);
+
   // We have to go through the shutdown and destroy mechanisms because there
   // are unit tests that create a service on a context and then change the
   // testing service mid-test.
   ContextShutdown(context);
   ContextDestroyed(context);
 
   if (add_context)
     MarkPreferencesSetOn(context);
 
   testing_factories_[context] = testing_factory;
@@ skipping 81 matching lines @@
 
 bool RefcountedKeyedServiceFactory::HasTestingFactory(
     base::SupportsUserData* context) {
   return testing_factories_.find(context) != testing_factories_.end();
 }
 
 void RefcountedKeyedServiceFactory::CreateServiceNow(
     base::SupportsUserData* context) {
   GetServiceForContext(context, true);
 }