Represent BINARY properties using std::string instead of BinaryValue,

tools/json_schema_compiler/cc_generator.py

 # 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.
 
 from code import Code
 from model import PropertyType
 import any_helper
 import cpp_util
 import model
 import schema_util
@@ skipping 326 matching lines @@
         return '%s->ToValue().release()' % var
       else:
         return '%s.ToValue().release()' % var
     elif prop.type_ == PropertyType.ANY:
       return '%s.DeepCopy()' % self._any_helper.GetValue(prop, var)
     elif prop.type_ == PropertyType.ADDITIONAL_PROPERTIES:
       return '%s.DeepCopy()' % var
     elif prop.type_ == PropertyType.ENUM:
       return 'CreateEnumValue(%s).release()' % var
     elif prop.type_ == PropertyType.BINARY:
-      return '%s->DeepCopy()' % var
+      if prop.optional:
+        return 'base::BinaryValue::CreateWithCopiedBuffer(*%s)' % var
+      else:
+        return 'base::BinaryValue::CreateWithCopiedBuffer(%s)' % var
     elif self._IsArrayOrArrayRef(prop):
       return '%s.release()' % self._util_cc_helper.CreateValueFromArray(
           self._cpp_type_generator.GetReferencedProperty(prop), var,
           prop.optional)
     elif self._IsFundamentalOrFundamentalRef(prop):
       if prop.optional:
         var = '*' + var
       prop = self._cpp_type_generator.GetReferencedProperty(prop);
       return {
           PropertyType.STRING: 'base::Value::CreateStringValue(%s)',
@@ skipping 166 matching lines @@
       (c.Append('default:')
         .Append('  return %(failure_value)s;')
       )
       c.Eblock('}')
     elif prop.type_ == PropertyType.ENUM:
       c.Sblock('{')
       self._GenerateStringToEnumConversion(c, prop, value_var, 'enum_temp')
       c.Append('%(dst)s->%(name)s = enum_temp;')
       c.Eblock('}')
     elif prop.type_ == PropertyType.BINARY:
-      # This is the same if the property is optional or not. We need a pointer
-      # to the base::BinaryValue to be able to populate it, so a scoped_ptr is
-      # used whether it is optional or required.
       (c.Append('if (!%(value_var)s->IsType(%(value_type)s))')
         .Append('  return %(failure_value)s;')
-        .Append('%(dst)s->%(name)s.reset(')
-        .Append('    static_cast<base::BinaryValue*>(%(value_var)s)'
-                '->DeepCopy());')
-      )
+        .Append('base::BinaryValue* binary_value =')
+        .Append('    static_cast<base::BinaryValue*>(%(value_var)s);')
+       )
+      if prop.optional:
+        (c.Append('%(dst)s->%(name)s.reset(')
+          .Append('    new std::string(binary_value->GetBuffer(),')
+          .Append('                    binary_value->GetSize()));')
+         )
+      else:
+        (c.Append('%(dst)s->%(name)s.assign(binary_value->GetBuffer(),')
+          .Append('                         binary_value->GetSize());')
+         )
     else:
       raise NotImplementedError(prop.type_)
     c.Eblock('}')
     sub = {
         'value_var': value_var,
         'name': prop.unix_name,
         'dst': dst,
         'failure_value': failure_value,
     }
     if prop.type_ not in (PropertyType.CHOICES, PropertyType.ANY):
@@ skipping 144 matching lines @@
     """
     return (self._cpp_type_generator.GetReferencedProperty(prop).type_ ==
         PropertyType.ARRAY)
 
   def _IsFundamentalOrFundamentalRef(self, prop):
     """Determines if this property is a Fundamental type or is a ref to a
     Fundamental type.
     """
     return (self._cpp_type_generator.GetReferencedProperty(prop).type_.
         is_fundamental)