more changes

base/json/json_reader.cc

 // Copyright (c) 2011 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.
 
 #include "base/json/json_reader.h"
 
 #include "base/float_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
@@ skipping 201 matching lines @@
   }
 
   scoped_ptr<Value> node;
 
   switch (token.type) {
     case Token::END_OF_INPUT:
     case Token::INVALID_TOKEN:
       return NULL;
 
     case Token::NULL_TOKEN:
-      node.reset(Value::CreateNullValue());
+      node.reset(NullValue());
       break;
 
     case Token::BOOL_TRUE:
-      node.reset(Value::CreateBooleanValue(true));
+      node.reset(TrueValue());
       break;
 
     case Token::BOOL_FALSE:
-      node.reset(Value::CreateBooleanValue(false));
+      node.reset(FalseValue());
       break;
 
     case Token::NUMBER:
       node.reset(DecodeNumber(token));
       if (!node.get())
         return NULL;
       break;
 
     case Token::STRING:
       node.reset(DecodeString(token));
@@ skipping 144 matching lines @@
   }
 
   return token;
 }
 
 Value* JSONReader::DecodeNumber(const Token& token) {
   const std::wstring num_string(token.begin, token.length);
 
   int num_int;
   if (StringToInt(WideToUTF8(num_string), &num_int))
-    return Value::CreateIntegerValue(num_int);
+    return NumberValue::New(num_int);
 
   double num_double;
   if (StringToDouble(WideToUTF8(num_string), &num_double) &&
       base::IsFinite(num_double))
-    return Value::CreateDoubleValue(num_double);
+    return NumberValue::New(num_double);
 
   return NULL;
 }
 
 JSONReader::Token JSONReader::ParseStringToken() {
   Token token(Token::STRING, json_pos_, 1);
   wchar_t c = token.NextChar();
   while ('\0' != c) {
     if ('\\' == c) {
       ++token.length;
@@ skipping 87 matching lines @@
           // We should only have valid strings at this point.  If not,
           // ParseStringToken didn't do it's job.
           NOTREACHED();
           return NULL;
       }
     } else {
       // Not escaped
       decoded_str.push_back(c);
     }
   }
-  return Value::CreateStringValue(WideToUTF16Hack(decoded_str));
+  return StringValue::New(WideToUTF16Hack(decoded_str));
 }
 
 JSONReader::Token JSONReader::ParseToken() {
   static const std::wstring kNullString(L"null");
   static const std::wstring kTrueString(L"true");
   static const std::wstring kFalseString(L"false");
 
   EatWhitespaceAndComments();
 
   Token token(Token::INVALID_TOKEN, 0, 0);
@@ skipping 146 matching lines @@
       ++column_number;
     }
   }
 
   error_line_ = line_number;
   error_col_ = column_number;
   error_code_ = error;
 }
 
 }  // namespace base