Decoupled the SchemaRegistryService from SchemaRegistry.

chrome/browser/extensions/api/storage/managed_value_store_cache.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 "chrome/browser/extensions/api/storage/managed_value_store_cache.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 89 matching lines @@
       extension_registry_observer_;
   policy::SchemaRegistry* schema_registry_;
   base::WeakPtrFactory<ExtensionTracker> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionTracker);
 };
 
 ManagedValueStoreCache::ExtensionTracker::ExtensionTracker(Profile* profile)
     : profile_(profile),
       extension_registry_observer_(this),
-      schema_registry_(
-          policy::SchemaRegistryServiceFactory::GetForContext(profile)),
+      schema_registry_(policy::SchemaRegistryServiceFactory::GetForContext(
+                           profile)->registry()),
       weak_factory_(this) {
   extension_registry_observer_.Add(ExtensionRegistry::Get(profile_));
   // Load schemas when the extension system is ready. It might be ready now.
   ExtensionSystem::Get(profile_)->ready().Post(
       FROM_HERE,
       base::Bind(&ExtensionTracker::OnExtensionsReady,
                  weak_factory_.GetWeakPtr()));
 }
 
 void ManagedValueStoreCache::ExtensionTracker::OnExtensionWillBeInstalled(
@@ skipping 162 matching lines @@
 void ManagedValueStoreCache::OnPolicyServiceInitialized(
     policy::PolicyDomain domain) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (domain != policy::POLICY_DOMAIN_EXTENSIONS)
     return;
 
   // The PolicyService now has all the initial policies ready. Send policy
   // for all the managed extensions to their backing stores now.
   policy::SchemaRegistry* registry =
-      policy::SchemaRegistryServiceFactory::GetForContext(profile_);
+      policy::SchemaRegistryServiceFactory::GetForContext(profile_)->registry();
   const policy::ComponentMap* map = registry->schema_map()->GetComponents(
       policy::POLICY_DOMAIN_EXTENSIONS);
   if (!map)
     return;
 
   const policy::PolicyMap empty_map;
   for (policy::ComponentMap::const_iterator it = map->begin();
        it != map->end(); ++it) {
     const policy::PolicyNamespace ns(policy::POLICY_DOMAIN_EXTENSIONS,
                                      it->first);
@@ skipping 57 matching lines @@
 
   return store;
 }
 
 bool ManagedValueStoreCache::HasStore(const std::string& extension_id) const {
   // TODO(joaodasilva): move this check to a ValueStore method.
   return base::DirectoryExists(base_path_.AppendASCII(extension_id));
 }
 
 }  // namespace extensions