Removed ConfigurationPolicyType and extended PolicyMap.

chrome/app/policy/cloud_policy_codegen.gyp

-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# 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.
 
 {
   'variables': {
     'chromium_code': 1,
     'policy_out_dir': '<(SHARED_INTERMEDIATE_DIR)/policy',
     'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
     'generate_policy_source_script_path':
         '<(DEPTH)/chrome/tools/build/generate_policy_source.py',
     'policy_constant_header_path':
         '<(policy_out_dir)/policy/policy_constants.h',
     'policy_constant_source_path':
         '<(policy_out_dir)/policy/policy_constants.cc',
-    'configuration_policy_type_header_path':
-        '<(policy_out_dir)/policy/configuration_policy_type.h',
     'protobuf_decoder_path':
         '<(policy_out_dir)/policy/cloud_policy_generated.cc',
     'cloud_policy_proto_path': '<(policy_out_dir)/policy/cloud_policy.proto',
     'proto_path_substr': 'chrome/browser/policy/proto',
     'proto_rel_path': '<(DEPTH)/<(proto_path_substr)',
   },
   'targets': [
     {
       'target_name': 'cloud_policy_code_generate',
       'type': 'none',
       'actions': [
         {
           'inputs': [
             'policy_templates.json',
             '<(generate_policy_source_script_path)',
           ],
           'outputs': [
             '<(policy_constant_header_path)',
             '<(policy_constant_source_path)',
-            '<(configuration_policy_type_header_path)',
             '<(protobuf_decoder_path)',
             '<(cloud_policy_proto_path)',
           ],
           'action_name': 'generate_policy_source',
           'action': [
             'python',
             '<@(generate_policy_source_script_path)',
             '--policy-constants-header=<(policy_constant_header_path)',
             '--policy-constants-source=<(policy_constant_source_path)',
-            '--policy-type-header=<(configuration_policy_type_header_path)',
             '--policy-protobuf=<(cloud_policy_proto_path)',
             '--protobuf-decoder=<(protobuf_decoder_path)',
             '<(OS)',
             '<(chromeos)',
             'policy_templates.json',
           ],
           'message': 'Generating policy source',
         },
       ],
       'direct_dependent_settings': {
@@ skipping 84 matching lines @@
       'hard_dependency': 1,
       'direct_dependent_settings': {
         'include_dirs': [
           '<(policy_out_dir)',
           '<(protoc_out_dir)',
         ],
       },
       'sources': [
         '<(policy_constant_header_path)',
         '<(policy_constant_source_path)',
-        '<(configuration_policy_type_header_path)',
         '<(protobuf_decoder_path)',
         '<(protoc_out_dir)/<(proto_path_substr)/cloud_policy.pb.h',
         '<(protoc_out_dir)/<(proto_path_substr)/cloud_policy.pb.cc',
         '<(protoc_out_dir)/<(proto_path_substr)/old_generic_format.pb.h',
         '<(protoc_out_dir)/<(proto_path_substr)/old_generic_format.pb.cc',
         '<(DEPTH)/chrome/browser/policy/policy_map.h',
         '<(DEPTH)/chrome/browser/policy/policy_map.cc',
       ],
       'include_dirs': [
         '<(DEPTH)',
@@ skipping 10 matching lines @@
   'conditions': [
     ['OS=="win"', {
       'targets': [
         {
           'target_name': 'policy_win64',
           'type': 'static_library',
           'hard_dependency': 1,
           'sources': [
             '<(policy_constant_header_path)',
             '<(policy_constant_source_path)',
-            '<(configuration_policy_type_header_path)',
           ],
           'include_dirs': [
             '<(DEPTH)',
           ],
           'direct_dependent_settings':  {
             'include_dirs': [
               '<(policy_out_dir)'
             ],
           },
           'dependencies': [
             'cloud_policy_code_generate',
           ],
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],  # 'conditions'
 }