Remove base::Value::Get{Buffer,Size}

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 cpp_util
 import schema_util
 import util_cc_helper
 from cpp_namespace_environment import CppNamespaceEnvironment
@@ skipping 870 matching lines @@
       else:
         (c.Append('if (!%%(cpp_type)s::Populate(%s))' % self._GenerateArgs(
             ('*%(src_var)s', '&%(dst_var)s')))
           .Append('  return %(failure_value)s;'))
     elif underlying_type.property_type == PropertyType.ENUM:
       c.Concat(self._GenerateStringToEnumConversion(underlying_type,
                                                     src_var,
                                                     dst_var,
                                                     failure_value))
     elif underlying_type.property_type == PropertyType.BINARY:
-      (c.Append('const base::Value* binary_value = NULL;')
-        .Sblock('if (!%(src_var)s->IsType(base::Value::Type::BINARY)) {')
+      (c.Sblock('if (!%(src_var)s->IsType(base::Value::Type::BINARY)) {')
         .Concat(self._GenerateError(
           '"\'%%(key)s\': expected binary, got " + ' +
           self._util_cc_helper.GetValueTypeString('%%(src_var)s', True)))
       )
       if not self._generate_error_messages:
         c.Append('return %(failure_value)s;')
       (c.Eblock('}')
         .Sblock('else {')
-        .Append(' binary_value =')
-        .Append('   static_cast<const base::Value*>(%(src_var)s);')
       )
       if is_ptr:
-        (c.Append('%(dst_var)s.reset(new std::vector<char>(')
-          .Append('    binary_value->GetBuffer(),')
-          .Append('    binary_value->GetBuffer() + binary_value->GetSize()));')
-        )
+        c.Append(
+            '%(dst_var)s.reset(new std::vector<char>(%(src_var)s->GetBlob()));')

[jdoerrie, 2017/04/25 08:50:34]

dst_var might be null, which caused the SIGSEGV on the bots. Do you mind taking
another look at this, rdevlin.cronin@?

       else:
-        (c.Append('%(dst_var)s.assign(')
-          .Append('    binary_value->GetBuffer(),')
-          .Append('    binary_value->GetBuffer() + binary_value->GetSize());')
-        )
+        c.Append('%(dst_var)s = %(src_var)s->GetBlob();')
       c.Eblock('}')
     else:
       raise NotImplementedError(type_)
     if c.IsEmpty():
       return c
     return Code().Sblock('{').Concat(c.Substitute({
       'cpp_type': self._type_helper.GetCppType(type_),
       'src_var': src_var,
       'dst_var': dst_var,
       'failure_value': failure_value,
@@ skipping 232 matching lines @@
     if self._generate_error_messages:
       params = list(params) + ['base::string16* error']
     return ', '.join(str(p) for p in params)
 
   def _GenerateArgs(self, args):
     """Builds the argument list for a function, given an array of arguments.
     """
     if self._generate_error_messages:
       args = list(args) + ['error']
     return ', '.join(str(a) for a in args)