Refactored ConfigurationPolicyProvider to provide PolicyBundles instead of PolicyMaps.

chrome/browser/policy/mock_configuration_policy_provider.h

 // 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.
 
 #ifndef CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_
 #define CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_
 #pragma once
 
 #include "chrome/browser/policy/configuration_policy_provider.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace policy {
 
 // Mock ConfigurationPolicyProvider implementation that supplies canned
 // values for polices.
 class MockConfigurationPolicyProvider : public ConfigurationPolicyProvider {
  public:
   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::UpdateProviderPolicy;
+
+  // Utility method that invokes UpdateProviderPolicy() with a
+  // PolicyDirectory that maps the Chrome namespace to a copy of |policy|.

[Mattias Nissler (ping if slow), 2012/05/14 09:07:21]

Bundle

[Joao da Silva, 2012/05/14 09:39:17]

Done.

+  void UpdateProviderChromePolicy(const PolicyMap& policy);
 };
 
-// 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;
-}
-
 class MockConfigurationPolicyObserver
     : public ConfigurationPolicyProvider::Observer {
  public:
   MockConfigurationPolicyObserver();
   virtual ~MockConfigurationPolicyObserver();
 
   MOCK_METHOD1(OnUpdatePolicy, void(ConfigurationPolicyProvider*));
   MOCK_METHOD1(OnProviderGoingAway, void(ConfigurationPolicyProvider*));
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_