Use TestingProfile::Builder::AddTestingFactory at ChromeRenderViewHostTestHarness

components/browser_context_keyed_service/browser_context_keyed_service_factory.cc

Index: components/browser_context_keyed_service/browser_context_keyed_service_factory.cc
diff --git a/components/browser_context_keyed_service/browser_context_keyed_service_factory.cc b/components/browser_context_keyed_service/browser_context_keyed_service_factory.cc
index c9d6646e03c279f6caa15fe0082324c6a4ca4cfb..d8d51fb1e897d0acc2b12a5614e98b0d2093c676 100644
--- a/components/browser_context_keyed_service/browser_context_keyed_service_factory.cc
+++ b/components/browser_context_keyed_service/browser_context_keyed_service_factory.cc
@@ -49,6 +49,11 @@ BrowserContextKeyedServiceFactory::SetTestingFactoryAndUse(
   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) {
@@ -127,7 +132,7 @@ void BrowserContextKeyedServiceFactory::BrowserContextDestroyed(
   // 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);
 }