Policy providers all get a SchemaRegistry to work with.

chrome/browser/policy/mock_configuration_policy_provider.h

Index: chrome/browser/policy/mock_configuration_policy_provider.h
diff --git a/chrome/browser/policy/mock_configuration_policy_provider.h b/chrome/browser/policy/mock_configuration_policy_provider.h
index ee3ddbf264cd8d07f940e3c837e6d1bb6c456b6d..eb7fd53f7694a852ddfb3f3efc32445adc9264cb 100644
--- a/chrome/browser/policy/mock_configuration_policy_provider.h
+++ b/chrome/browser/policy/mock_configuration_policy_provider.h
@@ -5,9 +5,10 @@
 #ifndef CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_
 #define CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_
 
+#include "base/basictypes.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
-#include "chrome/browser/policy/policy_domain_descriptor.h"
 #include "chrome/browser/policy/policy_map.h"
+#include "chrome/browser/policy/schema_registry.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace policy {
@@ -25,15 +26,24 @@ class MockConfigurationPolicyProvider : public ConfigurationPolicyProvider {
   MOCK_CONST_METHOD1(IsInitializationComplete, bool(PolicyDomain domain));
   MOCK_METHOD0(RefreshPolicies, void());
 
-  MOCK_METHOD1(RegisterPolicyDomain,
-               void(scoped_refptr<const PolicyDomainDescriptor>));
-
   // Make public for tests.
   using ConfigurationPolicyProvider::UpdatePolicy;
 
   // Utility method that invokes UpdatePolicy() with a PolicyBundle that maps
   // the Chrome namespace to a copy of |policy|.
   void UpdateChromePolicy(const PolicyMap& policy);
+
+  // Convenience method so that tests don't need to create a registry to create
+  // this mock.
+  using ConfigurationPolicyProvider::Init;
+  void Init() {
+    ConfigurationPolicyProvider::Init(&registry_);
+  }
+
+ private:
+  SchemaRegistry registry_;
+
+  DISALLOW_COPY_AND_ASSIGN(MockConfigurationPolicyProvider);
 };
 
 class MockConfigurationPolicyObserver