Support decoding GenericNamedValue based policy.

chrome/tools/build/generate_policy_source.py

Index: chrome/tools/build/generate_policy_source.py
diff --git a/chrome/tools/build/generate_policy_source.py b/chrome/tools/build/generate_policy_source.py
index 4de4fefbf2553c8dac0e290d2d9a0b12d6651d85..42676a976ae6a42da66721d194a56db48084c7ab 100644
--- a/chrome/tools/build/generate_policy_source.py
+++ b/chrome/tools/build/generate_policy_source.py
@@ -150,6 +150,10 @@ def _WritePolicyTypeEnumerationHeader(template_file_contents, args, opts):
 PROTO_HEAD = '''
 syntax = "proto2";
 
+// TODO(jkummerow): Remove this when it's no longer needed (see comment
+// inside the imported file).
+import "old_generic_format.proto";
+
 option optimize_for = LITE_RUNTIME;
 
 package enterprise_management;
@@ -212,6 +216,12 @@ def _WriteProtobuf(template_file_contents, args, outfilepath):
     f.write('// --------------------------------------------------\n'
             '// Big wrapper PB containing the above groups.\n\n'
             'message CloudPolicySettings {\n')
+
+    # TODO(jkummerow): Remove this when old_generic_format.proto is no longer
+    # imported.
+    f.write(
+      '  repeated enterprise_management.GenericNamedValue named_value = 2;')
+
     f.write(''.join(fields))
     f.write('}\n\n')