Add TYPE_INTEGER64 type to base::Value.

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/basictypes.h"
 #include "base/float_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 
 namespace {
@@ skipping 366 matching lines @@
       c = token.NextChar();
     }
     if (!ReadInt(token, true))
       return Token::CreateInvalidToken();
   }
 
   return token;
 }
 
 Value* JSONReader::DecodeNumber(const Token& token) {
-  const std::wstring num_string(token.begin, token.length);
+  const std::wstring num_wstring(token.begin, token.length);
+  const std::string& num_string(WideToUTF8(num_wstring));
 
   int num_int;
-  if (StringToInt(WideToUTF8(num_string), &num_int))
+  if (StringToInt(num_string, &num_int))
     return Value::CreateIntegerValue(num_int);
 
+  int64 num_int64;
+  if (StringToInt64(num_string, &num_int64))
+    return Value::CreateInteger64Value(num_int64);
+
   double num_double;
-  if (StringToDouble(WideToUTF8(num_string), &num_double) &&
+  if (StringToDouble(num_string, &num_double) &&
       base::IsFinite(num_double))
     return Value::CreateDoubleValue(num_double);
 
   return NULL;
 }
 
 JSONReader::Token JSONReader::ParseStringToken() {
   Token token(Token::STRING, json_pos_, 1);
   wchar_t c = token.NextChar();
   while ('\0' != c) {
@@ skipping 246 matching lines @@
       ++column_number;
     }
   }
 
   error_line_ = line_number;
   error_col_ = column_number;
   error_code_ = error;
 }
 
 }  // namespace base