Use TestingProfile::Builder::AddTestingFactory at ChromeRenderViewHostTestHarness

components/browser_context_keyed_service/browser_context_keyed_service_factory.h

Index: components/browser_context_keyed_service/browser_context_keyed_service_factory.h
diff --git a/components/browser_context_keyed_service/browser_context_keyed_service_factory.h b/components/browser_context_keyed_service/browser_context_keyed_service_factory.h
index f97144d1085f8d877f03efcc3dde08cbd543eb52..4ebab5992ccef8a662ebb8e394269b06d774230d 100644
--- a/components/browser_context_keyed_service/browser_context_keyed_service_factory.h
+++ b/components/browser_context_keyed_service/browser_context_keyed_service_factory.h
@@ -46,6 +46,12 @@ class BROWSER_CONTEXT_KEYED_SERVICE_EXPORT BrowserContextKeyedServiceFactory
       content::BrowserContext* context,
       TestingFactoryFunction factory);
 
+  // Removes the testing factory associated with |context|, if there is one.
+  // This can be used by tests that require a service that isn't created for
+  // tests by default (because its factory returns true from
+  // ServiceIsNULLWhileTesting).
+  void RemoveTestingFactory(content::BrowserContext* context);

[Paweł Hajdan Jr., 2014/03/07 22:08:12]

This can easily make the code harder to follow. Can we avoid setting the testing
factory to something unwanted in the first place?

[Joao da Silva, 2014/03/07 23:29:20]

That would be great, can you suggest a way to do it?

Note that the factory isn't being set by a test directly;
BrowserContextDependencyManager::DoCreateBrowserContextServices() calls
SetEmptyTestingFactory() when ServiceIsNULLWhileTesting is true, which sets a
NULL factory; that's what's getting cleared here.

+
  protected:
   // BrowserContextKeyedServiceFactories must communicate with a
   // BrowserContextDependencyManager. For all non-test code, write your subclass