Use TestingProfile::Builder::AddTestingFactory at ChromeRenderViewHostTestHarness

components/browser_context_keyed_service/browser_context_keyed_service_factory.cc

 // Copyright (c) 2012 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/browser_context_keyed_service/browser_context_keyed_service_factory.h"
 
 #include <map>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 31 matching lines @@
 
 BrowserContextKeyedService*
 BrowserContextKeyedServiceFactory::SetTestingFactoryAndUse(
     content::BrowserContext* context,
     TestingFactoryFunction testing_factory) {
   DCHECK(testing_factory);
   SetTestingFactory(context, testing_factory);
   return GetServiceForBrowserContext(context, true);
 }
 
+void BrowserContextKeyedServiceFactory::RemoveTestingFactory(
+    content::BrowserContext* context) {
+  testing_factories_.erase(context);

[Andrew T Wilson (Slow), 2014/03/10 12:30:45]

I think we should get rid of this, but if we keep it, it should be robust by
rebuilding the context, just like SetTestingFactory() does.

+}
+
 BrowserContextKeyedServiceFactory::BrowserContextKeyedServiceFactory(
     const char* name, BrowserContextDependencyManager* manager)
     : BrowserContextKeyedBaseFactory(name, manager) {
 }
 
 BrowserContextKeyedServiceFactory::~BrowserContextKeyedServiceFactory() {
   DCHECK(mapping_.empty());
 }
 
 BrowserContextKeyedService*
@@ skipping 58 matching lines @@
 }
 
 void BrowserContextKeyedServiceFactory::BrowserContextDestroyed(
     content::BrowserContext* context) {
   Disassociate(context);
 
   // For unit tests, we also remove the factory function both so we don't
   // maintain a big map of dead pointers, but also since we may have a second
   // object that lives at the same address (see other comments about unit tests
   // in this file).
-  testing_factories_.erase(context);
+  RemoveTestingFactory(context);
 
   BrowserContextKeyedBaseFactory::BrowserContextDestroyed(context);
 }
 
 void BrowserContextKeyedServiceFactory::SetEmptyTestingFactory(
     content::BrowserContext* context) {
   SetTestingFactory(context, NULL);
 }
 
 void BrowserContextKeyedServiceFactory::CreateServiceNow(
     content::BrowserContext* context) {
   GetServiceForBrowserContext(context, true);
 }