Refactored ConfigurationPolicyProvider to provide PolicyBundles instead of PolicyMaps.

chrome/browser/policy/mock_configuration_policy_provider.cc

Index: chrome/browser/policy/mock_configuration_policy_provider.cc
diff --git a/chrome/browser/policy/mock_configuration_policy_provider.cc b/chrome/browser/policy/mock_configuration_policy_provider.cc
index 5d5d7beb72a1138715aa7928a923a349a56c5471..d2e95d84f44b51fd5dea8bb1d07ee7205d0755bd 100644
--- a/chrome/browser/policy/mock_configuration_policy_provider.cc
+++ b/chrome/browser/policy/mock_configuration_policy_provider.cc
@@ -4,7 +4,10 @@
 
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
 
-#include "chrome/browser/policy/configuration_policy_pref_store.h"
+#include <string>
+
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/policy/policy_bundle.h"
 #include "policy/policy_constants.h"
 
 namespace policy {
@@ -14,6 +17,13 @@ MockConfigurationPolicyProvider::MockConfigurationPolicyProvider()
 
 MockConfigurationPolicyProvider::~MockConfigurationPolicyProvider() {}
 
+void MockConfigurationPolicyProvider::UpdateChromePolicy(
+    const PolicyMap& policy) {
+  scoped_ptr<PolicyBundle> bundle(new PolicyBundle());
+  bundle->Get(POLICY_DOMAIN_CHROME, std::string()).CopyFrom(policy);
+  UpdatePolicy(bundle.Pass());
+}
+
 MockConfigurationPolicyObserver::MockConfigurationPolicyObserver() {}
 
 MockConfigurationPolicyObserver::~MockConfigurationPolicyObserver() {}