Decoupled the SchemaRegistryService from SchemaRegistry.

chrome/browser/policy/schema_registry_service_factory.cc

 // Copyright 2013 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 "chrome/browser/policy/schema_registry_service_factory.h"
 
 #include "base/logging.h"
 #include "chrome/browser/policy/schema_registry_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/policy/core/common/schema.h"
@@ skipping 42 matching lines @@
   return it->second;
 }
 
 scoped_ptr<SchemaRegistryService>
 SchemaRegistryServiceFactory::CreateForContextInternal(
     content::BrowserContext* context,
     const Schema& chrome_schema,
     CombinedSchemaRegistry* global_registry) {
   DCHECK(!context->IsOffTheRecord());
   DCHECK(registries_.find(context) == registries_.end());
-  SchemaRegistryService* registry =
-      new SchemaRegistryService(chrome_schema, global_registry);
-  registries_[context] = registry;
-  return make_scoped_ptr(registry);
+  scoped_ptr<SchemaRegistry> registry(new SchemaRegistry);
+  scoped_ptr<SchemaRegistryService> service(new SchemaRegistryService(
+      registry.Pass(), chrome_schema, global_registry));
+  registries_[context] = service.get();
+  return service.Pass();
 }
 
 void SchemaRegistryServiceFactory::BrowserContextShutdown(
     content::BrowserContext* context) {
   if (context->IsOffTheRecord())
     return;
   RegistryMap::iterator it = registries_.find(context);
   if (it != registries_.end())
     it->second->Shutdown();
   else
     NOTREACHED();
 }
 
 void SchemaRegistryServiceFactory::BrowserContextDestroyed(
     content::BrowserContext* context) {
   registries_.erase(context);
   BrowserContextKeyedBaseFactory::BrowserContextDestroyed(context);
 }
 
 void SchemaRegistryServiceFactory::SetEmptyTestingFactory(
     content::BrowserContext* context) {}
 
 void SchemaRegistryServiceFactory::CreateServiceNow(
     content::BrowserContext* context) {}
 
 }  // namespace policy