Revert 75082 - New policy protobuf protocol.

- cloud_policy.proto autogenerated from policy_templates.json
- C++ method decoding the protobuf autogenerated from policy_templates.json
- changed policy fetching mechanism to fetch new-style policy protobufs

BUG=68309, chromium-os:11253, chromium-os:11255
TEST=CloudPolicyCacheTest.*; also manual test against python testserver

Review URL: http://codereview.chromium.org/6409040

TBR=jkummerow@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75084 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 10 deletions

diff --git a/chrome/browser/policy/configuration_policy_provider.h b/chrome/browser/policy/configuration_policy_provider.h
index 4eedab6..af2cddf 100644
--- a/chrome/browser/policy/configuration_policy_provider.h
+++ b/chrome/browser/policy/configuration_policy_provider.h
@@ -6,14 +6,12 @@
 #define CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_H_
 #pragma once
 
-#include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/policy/configuration_policy_store_interface.h"
-#include "policy/configuration_policy_type.h"
 
 namespace policy {
 
@@ -22,8 +20,6 @@ namespace policy {
 // etc.) should implement a subclass of this class.
 class ConfigurationPolicyProvider {
  public:
-  typedef std::map<ConfigurationPolicyType, Value*> PolicyMapType;
-
   class Observer {
    public:
     virtual ~Observer() {}
@@ -63,14 +59,9 @@ class ConfigurationPolicyProvider {
 
  protected:
   // Decodes the value tree and writes the configuration to the given |store|.
-  void ApplyPolicyValueTree(const DictionaryValue* policies,
+  void DecodePolicyValueTree(const DictionaryValue* policies,
                              ConfigurationPolicyStoreInterface* store);
 
-  // Writes the configuration found in the already-decoded map |policies| to
-  // the given |store|.
-  void ApplyPolicyMap(const PolicyMapType* policies,
-                      ConfigurationPolicyStoreInterface* store);
-
   const PolicyDefinitionList* policy_definition_list() const {
     return policy_definition_list_;
   }