Convert UserPolicySigninService to use OAuth2TokenService

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"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "content/public/browser/browser_context.h"
 
 void BrowserContextKeyedServiceFactory::SetTestingFactory(
     content::BrowserContext* context, FactoryFunction factory) {

[Mattias Nissler (ping if slow), 2013/08/19 14:03:22]

drive-by nit: args on separate lines

[Andrew T Wilson (Slow), 2013/08/20 09:28:35]

As a rule I don't fix style violations on already-existing lines of code I'm not
changing. But I'll bend my rule for you :-P

+  // Should not set a testing factory if we already have a global factory.

[Mattias Nissler (ping if slow), 2013/08/19 14:03:22]

why?

[Andrew T Wilson (Slow), 2013/08/20 09:28:35]

Because one clobbers the other - having a test set one and then overwrite it
with another seems like an error (conflicting test library routines, for
example).

+  DCHECK(!have_global_factory_);
+  CleanupExistingServices(context);
+  factories_[context] = factory;
+}
+
+void BrowserContextKeyedServiceFactory::CleanupExistingServices(
+    content::BrowserContext* context) {
   // 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);
 
   // 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.
   BrowserContextShutdown(context);
   BrowserContextDestroyed(context);
 
   if (add_context)
     MarkPreferencesSetOn(context);
+}
 
-  factories_[context] = factory;
+void BrowserContextKeyedServiceFactory::SetGlobalTestingFactory(
+    FactoryFunction factory) {
+  // Should not call SetGlobalTestingFactory() if factories already exist or
+  // if any services have been created already for any profile.
+  DCHECK(factories_.empty());
+
+  // Walk any existing contexts and clean up any services that have already
+  // been created.
+  while (!mapping_.empty()) {
+    BrowserContextKeyedServices::iterator it = mapping_.begin();
+    // Cleanup any existing services, and remove the service from |mapping_|.
+    CleanupExistingServices(it->first);
+  }
+
+  global_factory_ = factory;
+  have_global_factory_ = true;
+}
+
+void BrowserContextKeyedServiceFactory::ResetGlobalTestingFactory() {
+  have_global_factory_ = false;
 }
 
 BrowserContextKeyedService*
 BrowserContextKeyedServiceFactory::SetTestingFactoryAndUse(
     content::BrowserContext* context,
     FactoryFunction factory) {
   DCHECK(factory);
   SetTestingFactory(context, factory);
   return GetServiceForBrowserContext(context, true);
 }
 
 BrowserContextKeyedServiceFactory::BrowserContextKeyedServiceFactory(
     const char* name, BrowserContextDependencyManager* manager)
-    : BrowserContextKeyedBaseFactory(name, manager) {
+    : BrowserContextKeyedBaseFactory(name, manager),
+      have_global_factory_(false) {
 }
 
 BrowserContextKeyedServiceFactory::~BrowserContextKeyedServiceFactory() {
   DCHECK(mapping_.empty());
 }
 
 BrowserContextKeyedService*
 BrowserContextKeyedServiceFactory::GetServiceForBrowserContext(
     content::BrowserContext* context,
     bool create) {
   context = GetBrowserContextToUse(context);
   if (!context)
     return NULL;
 
   // NOTE: If you modify any of the logic below, make sure to update the
   // refcounted version in refcounted_context_keyed_service_factory.cc!
   BrowserContextKeyedServices::const_iterator it = mapping_.find(context);
   if (it != mapping_.end())
     return it->second;
 
   // Object not found.
   if (!create)
     return NULL;  // And we're forbidden from creating one.
 
   // Create new object.
   // Check to see if we have a per-BrowserContext testing factory that we should
   // use instead of default behavior.
   BrowserContextKeyedService* service = NULL;
-  BrowserContextOverriddenFunctions::const_iterator jt =
-      factories_.find(context);
-  if (jt != factories_.end()) {
-    if (jt->second) {
+  bool have_factory = have_global_factory_;
+  FactoryFunction factory = global_factory_;
+  if (!have_factory) {
+    BrowserContextOverriddenFunctions::const_iterator jt =
+        factories_.find(context);
+    if (jt != factories_.end()) {
+      have_factory = true;
+      factory = jt->second;
+    }
+  }
+  if (have_factory) {
+    if (factory) {
       if (!context->IsOffTheRecord())
         RegisterUserPrefsOnBrowserContext(context);
-      service = jt->second(context);
+      service = factory(context);
     }
   } else {
     service = BuildServiceInstanceFor(context);
   }
 
   Associate(context, service);
   return service;
 }
 
 void BrowserContextKeyedServiceFactory::Associate(
@@ skipping 29 matching lines @@
 
 void BrowserContextKeyedServiceFactory::SetEmptyTestingFactory(
     content::BrowserContext* context) {
   SetTestingFactory(context, NULL);
 }
 
 void BrowserContextKeyedServiceFactory::CreateServiceNow(
     content::BrowserContext* context) {
   GetServiceForBrowserContext(context, true);
 }