| Index: chrome/browser/policy/schema_registry_service.cc
|
| diff --git a/chrome/browser/policy/schema_registry_service.cc b/chrome/browser/policy/schema_registry_service.cc
|
| index b8124cde9f07fe88b498da9f1e193f8b3524c3ab..81f8f1146d48d3d7c157b3472285fe0819a5c932 100644
|
| --- a/chrome/browser/policy/schema_registry_service.cc
|
| +++ b/chrome/browser/policy/schema_registry_service.cc
|
| @@ -11,24 +11,19 @@
|
| namespace policy {
|
|
|
| SchemaRegistryService::SchemaRegistryService(
|
| + scoped_ptr<SchemaRegistry> registry,
|
| const Schema& chrome_schema,
|
| CombinedSchemaRegistry* global_registry)
|
| - : global_registry_(global_registry) {
|
| - if (chrome_schema.valid())
|
| - RegisterComponent(PolicyNamespace(POLICY_DOMAIN_CHROME, ""), chrome_schema);
|
| - SetReady(POLICY_DOMAIN_CHROME);
|
| - if (global_registry_)
|
| - global_registry->Track(this);
|
| + : registry_(registry.Pass()) {
|
| + if (chrome_schema.valid()) {
|
| + registry_->RegisterComponent(PolicyNamespace(POLICY_DOMAIN_CHROME, ""),
|
| + chrome_schema);
|
| + }
|
| + registry_->SetReady(POLICY_DOMAIN_CHROME);
|
| + if (global_registry)
|
| + global_registry->Track(registry_.get());
|
| }
|
|
|
| SchemaRegistryService::~SchemaRegistryService() {}
|
|
|
| -void SchemaRegistryService::Shutdown() {
|
| - if (global_registry_) {
|
| - global_registry_->Untrack(this);
|
| - global_registry_ = NULL;
|
| - }
|
| - DCHECK(!HasObservers());
|
| -}
|
| -
|
| } // namespace policy
|
|
|