Decoupled the SchemaRegistryService from SchemaRegistry.

chrome/browser/policy/schema_registry_service.h

Index: chrome/browser/policy/schema_registry_service.h
diff --git a/chrome/browser/policy/schema_registry_service.h b/chrome/browser/policy/schema_registry_service.h
index ecf97d794cd1dcb20eccc733c5979fd48d016682..19c7e0b4c26197e9d09f6196cdfd551ed7ea4ac1 100644
--- a/chrome/browser/policy/schema_registry_service.h
+++ b/chrome/browser/policy/schema_registry_service.h
@@ -14,22 +14,21 @@ namespace policy {
 
 class Schema;
 
-// A SchemaRegistry that is also a KeyedService, and is associated
-// with a Profile.
-class SchemaRegistryService : public SchemaRegistry, public KeyedService {
+// A KeyedService associated with a Profile that contains a SchemaRegistry.
+class SchemaRegistryService : public KeyedService {
  public:
-  // This SchemaRegistry will initially contain only the |chrome_schema|, if
+  // This |registry| will initially contain only the |chrome_schema|, if
   // it's valid. The optional |global_registry| must outlive this, and will
-  // track this registry.
-  SchemaRegistryService(const Schema& chrome_schema,
+  // track |registry|.
+  SchemaRegistryService(scoped_ptr<SchemaRegistry> registry,
+                        const Schema& chrome_schema,
                         CombinedSchemaRegistry* global_registry);
   virtual ~SchemaRegistryService();
 
-  // KeyedService:
-  virtual void Shutdown() OVERRIDE;
+  SchemaRegistry* registry() const { return registry_.get(); }
 
  private:
-  CombinedSchemaRegistry* global_registry_;
+  scoped_ptr<SchemaRegistry> registry_;

[bartfab (slow), 2014/06/20 14:48:01]

Nit: #include "base/memory/scoped_ptr.h"

[Joao da Silva, 2014/06/20 15:30:14]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(SchemaRegistryService);
 };