Refactored ConfigurationPolicyProvider to provide PolicyBundles instead of PolicyMaps.

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 8134f078160d2f8918f67aaf6dae684ecf2a5d86..ea12da47515dcb64082bfaf77a7662701dc7ad08 100644
--- a/chrome/browser/policy/mock_configuration_policy_provider.h
+++ b/chrome/browser/policy/mock_configuration_policy_provider.h
@@ -19,20 +19,16 @@ class MockConfigurationPolicyProvider : public ConfigurationPolicyProvider {
   MockConfigurationPolicyProvider();
   virtual ~MockConfigurationPolicyProvider();
 
-  MOCK_METHOD1(ProvideInternal, bool(PolicyMap*));
   MOCK_CONST_METHOD0(IsInitializationComplete, bool());
   MOCK_METHOD0(RefreshPolicies, void());
 
   // Make public for tests.
-  using ConfigurationPolicyProvider::NotifyPolicyUpdated;
-};
+  using ConfigurationPolicyProvider::UpdatePolicy;
 
-// A gmock action that copies |policy_map| into the first argument of the mock
-// method, as expected by ProvideInternal().
-ACTION_P(CopyPolicyMap, policy_map) {
-  arg0->CopyFrom(*policy_map);
-  return true;
-}
+  // Utility method that invokes UpdatePolicy() with a PolicyBundle that maps
+  // the Chrome namespace to a copy of |policy|.
+  void UpdateChromePolicy(const PolicyMap& policy);
+};
 
 class MockConfigurationPolicyObserver
     : public ConfigurationPolicyProvider::Observer {