Decoupled the SchemaRegistryService from SchemaRegistry.

chrome/browser/extensions/api/storage/settings_apitest.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 "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/storage/settings_sync_util.h"
@@ skipping 414 matching lines @@
     extension_system->ready().Post(FROM_HERE, run_loop.QuitClosure());
     run_loop.Run();
     ASSERT_TRUE(extension_system->ready().is_signaled());
   }
 
   // This test starts without any test extensions installed.
   EXPECT_FALSE(GetSingleLoadedExtension());
   message_.clear();
 
   policy::SchemaRegistry* registry =
-      policy::SchemaRegistryServiceFactory::GetForContext(profile);
+      policy::SchemaRegistryServiceFactory::GetForContext(profile)->registry();
   ASSERT_TRUE(registry);
   EXPECT_FALSE(registry->schema_map()->GetSchema(policy::PolicyNamespace(
       policy::POLICY_DOMAIN_EXTENSIONS, kManagedStorageExtensionId)));
 
   MockSchemaRegistryObserver observer;
   registry->AddObserver(&observer);
 
   // Install a managed extension.
   EXPECT_CALL(observer, OnSchemaRegistryUpdated(true));
   const Extension* extension =
@@ skipping 126 matching lines @@
   // ENABLE_CONFIGURATION_POLICY is not defined.
   StorageFrontend* frontend = StorageFrontend::Get(browser()->profile());
   frontend->DisableStorageForTesting(MANAGED);
   EXPECT_FALSE(frontend->IsStorageEnabled(MANAGED));
   // Now run the extension.
   ASSERT_TRUE(RunExtensionTest("settings/managed_storage_disabled"))
       << message_;
 }
 
 }  // namespace extensions