Remove FundamentalValue

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 632 matching lines @@
     elif underlying_type.property_type == PropertyType.ARRAY:
       return '%s' % self._util_cc_helper.CreateValueFromArray(
           var,
           is_ptr)
     elif underlying_type.property_type.is_fundamental:
       if is_ptr:
         var = '*%s' % var
       if underlying_type.property_type == PropertyType.STRING:
         return 'base::MakeUnique<base::StringValue>(%s)' % var
       else:
-        return 'base::MakeUnique<base::FundamentalValue>(%s)' % var
+        return 'base::MakeUnique<base::Value>(%s)' % var
     else:
       raise NotImplementedError('Conversion of %s to base::Value not '
                                 'implemented' % repr(type_.type_))
 
   def _GenerateParamsCheck(self, function, var):
     """Generates a check for the correct number of arguments when creating
     Params.
     """
     c = Code()
     num_required = 0
@@ skipping 95 matching lines @@
     code, if |dst_var| fails to be populated then Populate will return
     |failure_value|.
     """
     c = Code()
 
     underlying_type = self._type_helper.FollowRef(type_)
 
     if underlying_type.property_type.is_fundamental:
       if is_ptr:
         (c.Append('%(cpp_type)s temp;')
-          .Sblock('if (!%s) {' % cpp_util.GetAsFundamentalValue(
+          .Sblock('if (!%s) {' % cpp_util.GetAsValue(
                       self._type_helper.FollowRef(type_), src_var, '&temp'))
           .Concat(self._GenerateError(
             '"\'%%(key)s\': expected ' + '%s, got " + %s' % (
                 type_.name,
                 self._util_cc_helper.GetValueTypeString(
                     '%%(src_var)s', True)))))
         c.Append('%(dst_var)s.reset();')
         if not self._generate_error_messages:
           c.Append('return %(failure_value)s;')
         (c.Eblock('}')
           .Append('else')
           .Append('  %(dst_var)s.reset(new %(cpp_type)s(temp));')
         )
       else:
-        (c.Sblock('if (!%s) {' % cpp_util.GetAsFundamentalValue(
+        (c.Sblock('if (!%s) {' % cpp_util.GetAsValue(
                       self._type_helper.FollowRef(type_),
                       src_var,
                       '&%s' % dst_var))
           .Concat(self._GenerateError(
             '"\'%%(key)s\': expected ' + '%s, got " + %s' % (
                 type_.name,
                 self._util_cc_helper.GetValueTypeString(
                     '%%(src_var)s', True))))
           .Append('return %(failure_value)s;')
           .Eblock('}')
@@ skipping 355 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)