Index: tools/json_schema_compiler/cc_generator.py |
diff --git a/tools/json_schema_compiler/cc_generator.py b/tools/json_schema_compiler/cc_generator.py |
index 48a723e047246e4c54470a9b161a9cd1cfd002d9..f93c4d9fb80db3479fd43215e66af5161ca9485c 100644 |
--- a/tools/json_schema_compiler/cc_generator.py |
+++ b/tools/json_schema_compiler/cc_generator.py |
@@ -43,7 +43,6 @@ class _Generator(object): |
.Append() |
.Append(self._util_cc_helper.GetIncludePath()) |
.Append('#include "base/logging.h"') |
- .Append('#include "base/stl_util.h"') |
.Append('#include "base/strings/string_number_conversions.h"') |
.Append('#include "base/strings/utf_string_conversions.h"') |
.Append('#include "%s/%s.h"' % |
@@ -557,12 +556,10 @@ class _Generator(object): |
elif underlying_type.property_type == PropertyType.BINARY: |
if is_ptr: |
vardot = var + '->' |
- ref = var + '.get()' |
else: |
vardot = var + '.' |
- ref = '&' + var |
- return ('base::BinaryValue::CreateWithCopiedBuffer(vector_as_array(%s),' |
- ' %ssize())' % (ref, vardot)) |
+ return ('base::BinaryValue::CreateWithCopiedBuffer(%sdata(),' |
+ ' %ssize())' % (vardot, vardot)) |
elif underlying_type.property_type == PropertyType.ARRAY: |
return '%s.release()' % self._util_cc_helper.CreateValueFromArray( |
var, |