Convert UserPolicySigninService to use OAuth2TokenService

components/browser_context_keyed_service/browser_context_keyed_service_factory.h

 // 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.
 
 #ifndef COMPONENTS_BROWSER_CONTEXT_KEYED_SERVICE_BROWSER_CONTEXT_KEYED_SERVICE_FACTORY_H_
 #define COMPONENTS_BROWSER_CONTEXT_KEYED_SERVICE_BROWSER_CONTEXT_KEYED_SERVICE_FACTORY_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 21 matching lines @@
   typedef BrowserContextKeyedService*
       (*FactoryFunction)(content::BrowserContext* context);
 
   // Associates |factory| with |context| so that |factory| is used to create
   // the BrowserContextKeyedService when requested.  |factory| can be NULL
   // to signal that BrowserContextKeyedService should be NULL. Multiple calls to
   // SetTestingFactory() are allowed; previous services will be shut down.
   void SetTestingFactory(content::BrowserContext* context,
                          FactoryFunction factory);
 
+  // Like SetTestingFactory(), but takes effect for all contexts. This is useful
+  // for injecting services that are created as part of context initialization.
+  // Callers should be sure to call ResetGlobalTestingFactory() at the end of
+  // their test to avoid polluting the singletons for future tests.
+  void SetGlobalTestingFactory(FactoryFunction factory);

[Elliot Glaysher, 2013/08/16 18:07:59]

(Other half of code commented on.)

[Andrew T Wilson (Slow), 2013/08/19 12:15:56]

So, yeah, I'm happy to revert this part of my CL (adding
Set/ResetGlobalTestingFactory()) if you don't think it's valuable. For unit
tests, I think it's far superior to use TestingProfile::Builder to inject
dependencies - as it stands, this code is unused in this CL.

+
+  // Clears a global testing factory that was previously set.
+  void ResetGlobalTestingFactory();
+
   // Associates |factory| with |context| and immediately returns the created
   // BrowserContextKeyedService. Since the factory will be used immediately,
   // it may not be NULL.
   BrowserContextKeyedService* SetTestingFactoryAndUse(
       content::BrowserContext* context,
       FactoryFunction factory);
 
  protected:
   // BrowserContextKeyedServiceFactories must communicate with a
   // BrowserContextDependencyManager. For all non-test code, write your subclass
@@ skipping 51 matching lines @@
 
  private:
   friend class BrowserContextDependencyManager;
   friend class BrowserContextDependencyManagerUnittests;
 
   typedef std::map<content::BrowserContext*, BrowserContextKeyedService*>
       BrowserContextKeyedServices;
   typedef std::map<content::BrowserContext*, FactoryFunction>
       BrowserContextOverriddenFunctions;
 
+  void CleanupExistingServices(content::BrowserContext* context);
+
   // The mapping between a BrowserContext and its service.
   std::map<content::BrowserContext*, BrowserContextKeyedService*> mapping_;
 
   // The mapping between a BrowserContext and its overridden FactoryFunction.
   std::map<content::BrowserContext*, FactoryFunction> factories_;
 
+  FactoryFunction global_factory_;
+  bool have_global_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserContextKeyedServiceFactory);
 };
 
 #endif  // COMPONENTS_BROWSER_CONTEXT_KEYED_SERVICE_BROWSER_CONTEXT_KEYED_SERVICE_FACTORY_H_