Added a PolicyDomainDescriptor.

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 91c53109cc616e1c7f7ec73841c206eabcaf6507..ee3ddbf264cd8d07f940e3c837e6d1bb6c456b6d 100644
--- a/chrome/browser/policy/mock_configuration_policy_provider.h
+++ b/chrome/browser/policy/mock_configuration_policy_provider.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_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 "testing/gmock/include/gmock/gmock.h"
 
@@ -13,6 +14,9 @@ namespace policy {
 
 // Mock ConfigurationPolicyProvider implementation that supplies canned
 // values for polices.
+// TODO(joaodasilva, mnissler): introduce an implementation that non-policy
+// code can use that doesn't require the usual boilerplate.
+// http://crbug.com/242087
 class MockConfigurationPolicyProvider : public ConfigurationPolicyProvider {
  public:
   MockConfigurationPolicyProvider();
@@ -21,8 +25,8 @@ class MockConfigurationPolicyProvider : public ConfigurationPolicyProvider {
   MOCK_CONST_METHOD1(IsInitializationComplete, bool(PolicyDomain domain));
   MOCK_METHOD0(RefreshPolicies, void());
 
-  MOCK_METHOD2(RegisterPolicyDomain, void(PolicyDomain,
-                                          const std::set<std::string>&));
+  MOCK_METHOD1(RegisterPolicyDomain,
+               void(scoped_refptr<const PolicyDomainDescriptor>));
 
   // Make public for tests.
   using ConfigurationPolicyProvider::UpdatePolicy;