Make the internal storage of policy::Schemas ref counted.

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 94 matching lines @@
       new policy::PolicyDomainDescriptor(policy::POLICY_DOMAIN_EXTENSIONS));
   const ExtensionSet* set =
       ExtensionSystem::Get(profile_)->extension_service()->extensions();
   scoped_ptr<ExtensionSet> managed_extensions(new ExtensionSet());
   for (ExtensionSet::const_iterator it = set->begin(); it != set->end(); ++it) {
     if ((*it)->manifest()->HasPath(manifest_keys::kStorageManagedSchema)) {
       managed_extensions->Insert(*it);
     }
 
     // TODO(joaodasilva): also load extensions that use the storage API for now,
-    // to support the Legacy Browser Support extension. Remove this for M30.
+    // to support the Legacy Browser Support extension. Remove this.
     // http://crbug.com/240704
     if ((*it)->HasAPIPermission(APIPermission::kStorage))
       managed_extensions->Insert(*it);
   }
 
   // Load the schema files in a background thread.
   BrowserThread::PostBlockingPoolSequencedTask(
       kLoadSchemasBackgroundTaskTokenName, FROM_HERE,
       base::Bind(&ExtensionTracker::LoadSchemas,
                  base::Passed(&managed_extensions),
                  weak_factory_.GetWeakPtr()));
 }
 
 // static
 void ManagedValueStoreCache::ExtensionTracker::LoadSchemas(
     scoped_ptr<ExtensionSet> extensions,
     base::WeakPtr<ExtensionTracker> self) {
   scoped_refptr<policy::PolicyDomainDescriptor> descriptor =
       new policy::PolicyDomainDescriptor(policy::POLICY_DOMAIN_EXTENSIONS);
 
   for (ExtensionSet::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     std::string schema_file;
     if (!(*it)->manifest()->GetString(
             manifest_keys::kStorageManagedSchema, &schema_file)) {
-      // TODO(joaodasilva): Remove this for M32. http://crbug.com/240704
+      // TODO(joaodasilva): Remove this. http://crbug.com/240704
       if ((*it)->HasAPIPermission(APIPermission::kStorage)) {
-        descriptor->RegisterComponent((*it)->id(),
-                                      scoped_ptr<policy::SchemaOwner>());
+        descriptor->RegisterComponent((*it)->id(), policy::Schema());
       } else {
         NOTREACHED();
       }
       continue;
     }
     // The extension should have been validated, so assume the schema exists
     // and is valid.
     std::string error;
-    scoped_ptr<policy::SchemaOwner> schema =
+    policy::Schema schema =
         StorageSchemaManifestHandler::GetSchema(it->get(), &error);
-    CHECK(schema) << error;
-    descriptor->RegisterComponent((*it)->id(), schema.Pass());
+    CHECK(schema.valid()) << error;
+    descriptor->RegisterComponent((*it)->id(), schema);
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&ExtensionTracker::RegisterDomain, self, descriptor));
 }
 
 void ManagedValueStoreCache::ExtensionTracker::RegisterDomain(
     scoped_refptr<const policy::PolicyDomainDescriptor> descriptor) {
   policy::ProfilePolicyConnector* connector =
@@ skipping 237 matching lines @@
     continuation.Run();
 }
 
 policy::PolicyService* ManagedValueStoreCache::GetPolicyService() {
   policy::ProfilePolicyConnector* connector =
       policy::ProfilePolicyConnectorFactory::GetForProfile(profile_);
   return connector->policy_service();
 }
 
 }  // namespace extensions