Add support for int64 and uint64 in values.h's API.

base/values.h

 // 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.
 
 // This file specifies a recursive data storage class called Value intended for
 // storing settings and other persistable data.
 //
 // A Value represents something that can be stored in JSON or passed to/from
 // JavaScript. As such, it is NOT a generalized variant type, since only the
 // types supported by JavaScript/JSON are supported.
@@ skipping 74 matching lines @@
   // These methods allow the convenient retrieval of the contents of the Value.
   // If the current object can be converted into the given type, the value is
   // returned through the |out_value| parameter and true is returned;
   // otherwise, false is returned and |out_value| is unchanged.
   virtual bool GetAsBoolean(bool* out_value) const;
   virtual bool GetAsInteger(int* out_value) const;
   virtual bool GetAsDouble(double* out_value) const;
   virtual bool GetAsString(std::string* out_value) const;
   virtual bool GetAsString(string16* out_value) const;
   virtual bool GetAsString(const StringValue** out_value) const;
+  virtual bool GetAsInt64(int64* out_value) const;
+  virtual bool GetAsUint64(uint64* out_value) const;
   virtual bool GetAsList(ListValue** out_value);
   virtual bool GetAsList(const ListValue** out_value) const;
   virtual bool GetAsDictionary(DictionaryValue** out_value);
   virtual bool GetAsDictionary(const DictionaryValue** out_value) const;
   // Note: Do not add more types. See the file-level comment above for why.
 
   // This creates a deep copy of the entire Value tree, and returns a pointer
   // to the copy.  The caller gets ownership of the copy, of course.
   //
   // Subclasses return their own type directly in their overrides;
@@ skipping 35 matching lines @@
   virtual bool Equals(const Value* other) const OVERRIDE;
 
  private:
   union {
     bool boolean_value_;
     int integer_value_;
     double double_value_;
   };
 };
 
+// A Value to store strings or (u)int64s internally represented as strings.
+// Note that while a primitive value could be used for (u)int64s, they would
+// still have to be serialized as strings (for legacy reasons) and the parser
+// would need to make a decision as to which type it is on read (which it can't
+// do deterministically in the current format if we also have legitimate reasons
+// to want to explicitly store strings representing integers). In order to avoid
+// extra complexity, simply store (u)int64s as strings and let callers
+// explicitly state whether they  want the value as (u)int64 or as string.
 class BASE_EXPORT StringValue : public Value {
  public:
   // Initializes a StringValue with a UTF-8 narrow character string.
   explicit StringValue(const std::string& in_value);
 
   // Initializes a StringValue with a string16.
   explicit StringValue(const string16& in_value);
 
+  // Initializes a StringValue with an int64.
+  explicit StringValue(int64 in_value);
+
+  // Initializes a StringValue with a uint64.
+  explicit StringValue(uint64 in_value);
+
   virtual ~StringValue();
 
   // Returns |value_| as a pointer or reference.
   std::string* GetString();
   const std::string& GetString() const;
 
   // Overridden from Value:
   virtual bool GetAsString(std::string* out_value) const OVERRIDE;
   virtual bool GetAsString(string16* out_value) const OVERRIDE;
   virtual bool GetAsString(const StringValue** out_value) const OVERRIDE;
+  virtual bool GetAsInt64(int64* out_value) const OVERRIDE;
+  virtual bool GetAsUint64(uint64* out_value) const OVERRIDE;
   virtual StringValue* DeepCopy() const OVERRIDE;
   virtual bool Equals(const Value* other) const OVERRIDE;
 
  private:
   std::string value_;
 };
 
 class BASE_EXPORT BinaryValue: public Value {
  public:
   // Creates a BinaryValue with a null buffer and size of 0.
@@ skipping 63 matching lines @@
   // |in_value|, and therefore |in_value| must be non-NULL.
   void Set(const std::string& path, Value* in_value);
 
   // Convenience forms of Set().  These methods will replace any existing
   // value at that path, even if it has a different type.
   void SetBoolean(const std::string& path, bool in_value);
   void SetInteger(const std::string& path, int in_value);
   void SetDouble(const std::string& path, double in_value);
   void SetString(const std::string& path, const std::string& in_value);
   void SetString(const std::string& path, const string16& in_value);
+  // Int64 helper methods that actually store the given value as a string.
+  // Note that if obtaining the named value via Get, the Value type will be
+  // TYPE_STRING.
+  void SetInt64(const std::string& path, int64 value);
+  // As above, but for unsigned values.
+  void SetUint64(const std::string& path, uint64 value);
 
   // Like Set(), but without special treatment of '.'.  This allows e.g. URLs to
   // be used as paths.
   void SetWithoutPathExpansion(const std::string& key, Value* in_value);
 
   // Convenience forms of SetWithoutPathExpansion().
   void SetBooleanWithoutPathExpansion(const std::string& path, bool in_value);
   void SetIntegerWithoutPathExpansion(const std::string& path, int in_value);
   void SetDoubleWithoutPathExpansion(const std::string& path, double in_value);
   void SetStringWithoutPathExpansion(const std::string& path,
                                      const std::string& in_value);
   void SetStringWithoutPathExpansion(const std::string& path,
                                      const string16& in_value);
+  void SetInt64WithoutPathExpansion(const std::string& path, int64 value);
+  void SetUint64WithoutPathExpansion(const std::string& path, uint64 value);
 
   // Gets the Value associated with the given path starting from this object.
   // A path has the form "<key>" or "<key>.<key>.[...]", where "." indexes
   // into the next DictionaryValue down.  If the path can be resolved
   // successfully, the value for the last key in the path will be returned
   // through the |out_value| parameter, and the function will return true.
   // Otherwise, it will return false and |out_value| will be untouched.
   // Note that the dictionary always owns the value that's returned.
   // |out_value| is optional and will only be set if non-NULL.
   bool Get(const std::string& path, const Value** out_value) const;
   bool Get(const std::string& path, Value** out_value);
 
   // These are convenience forms of Get().  The value will be retrieved
   // and the return value will be true if the path is valid and the value at
   // the end of the path can be returned in the form specified.
   // |out_value| is optional and will only be set if non-NULL.
   bool GetBoolean(const std::string& path, bool* out_value) const;
   bool GetInteger(const std::string& path, int* out_value) const;
   // Values of both type TYPE_INTEGER and TYPE_DOUBLE can be obtained as
   // doubles.
   bool GetDouble(const std::string& path, double* out_value) const;
   bool GetString(const std::string& path, std::string* out_value) const;
   bool GetString(const std::string& path, string16* out_value) const;
   bool GetStringASCII(const std::string& path, std::string* out_value) const;
+  bool GetInt64(const std::string& path, int64* out_value) const;
+  bool GetUint64(const std::string& path, uint64* out_value) const;
   bool GetBinary(const std::string& path, const BinaryValue** out_value) const;
   bool GetBinary(const std::string& path, BinaryValue** out_value);
   bool GetDictionary(const std::string& path,
                      const DictionaryValue** out_value) const;
   bool GetDictionary(const std::string& path, DictionaryValue** out_value);
   bool GetList(const std::string& path, const ListValue** out_value) const;
   bool GetList(const std::string& path, ListValue** out_value);
 
   // Like Get(), but without special treatment of '.'.  This allows e.g. URLs to
   // be used as paths.
   bool GetWithoutPathExpansion(const std::string& key,
                                const Value** out_value) const;
   bool GetWithoutPathExpansion(const std::string& key, Value** out_value);
   bool GetBooleanWithoutPathExpansion(const std::string& key,
                                       bool* out_value) const;
   bool GetIntegerWithoutPathExpansion(const std::string& key,
                                       int* out_value) const;
   bool GetDoubleWithoutPathExpansion(const std::string& key,
                                      double* out_value) const;
   bool GetStringWithoutPathExpansion(const std::string& key,
                                      std::string* out_value) const;
   bool GetStringWithoutPathExpansion(const std::string& key,
                                      string16* out_value) const;
+  bool GetInt64WithoutPathExpansion(const std::string& path,
+                                    int64* out_value) const;
+  bool GetUint64WithoutPathExpansion(const std::string& path,
+                                     uint64* out_value) const;
   bool GetDictionaryWithoutPathExpansion(
       const std::string& key,
       const DictionaryValue** out_value) const;
   bool GetDictionaryWithoutPathExpansion(const std::string& key,
                                          DictionaryValue** out_value);
   bool GetListWithoutPathExpansion(const std::string& key,
                                    const ListValue** out_value) const;
   bool GetListWithoutPathExpansion(const std::string& key,
                                    ListValue** out_value);
 
@@ skipping 93 matching lines @@
   // only if the index is valid and the Value at that index can be returned
   // in the specified form.
   // |out_value| is optional and will only be set if non-NULL.
   bool GetBoolean(size_t index, bool* out_value) const;
   bool GetInteger(size_t index, int* out_value) const;
   // Values of both type TYPE_INTEGER and TYPE_DOUBLE can be obtained as
   // doubles.
   bool GetDouble(size_t index, double* out_value) const;
   bool GetString(size_t index, std::string* out_value) const;
   bool GetString(size_t index, string16* out_value) const;
+  bool GetInt64(size_t index, int64* out_value) const;
+  bool GetUint64(size_t index, uint64* out_value) const;
   bool GetBinary(size_t index, const BinaryValue** out_value) const;
   bool GetBinary(size_t index, BinaryValue** out_value);
   bool GetDictionary(size_t index, const DictionaryValue** out_value) const;
   bool GetDictionary(size_t index, DictionaryValue** out_value);
   bool GetList(size_t index, const ListValue** out_value) const;
   bool GetList(size_t index, ListValue** out_value);
 
   // Removes the Value with the specified index from this list.
   // If |out_value| is non-NULL, the removed Value AND ITS OWNERSHIP will be
   // passed out via |out_value|.  If |out_value| is NULL, the removed value will
@@ skipping 16 matching lines @@
   void Append(Value* in_value);
 
   // Convenience forms of Append.
   void AppendBoolean(bool in_value);
   void AppendInteger(int in_value);
   void AppendDouble(double in_value);
   void AppendString(const std::string& in_value);
   void AppendString(const string16& in_value);
   void AppendStrings(const std::vector<std::string>& in_values);
   void AppendStrings(const std::vector<string16>& in_values);
+  // Int64 helper methods that actually store the given value as a string.
+  // Note that if obtaining the named value via Get, the Value type will be
+  // TYPE_STRING.
+  void AppendInt64(int64 value);
+  // As above, but for unsigned values.
+  void AppendUint64(uint64 value);
 
   // Appends a Value if it's not already present. Takes ownership of the
   // |in_value|. Returns true if successful, or false if the value was already
   // present. If the value was already present the |in_value| is deleted.
   bool AppendIfNotPresent(Value* in_value);
 
   // Insert a Value at index.
   // Returns true if successful, or false if the index was out of range.
   bool Insert(size_t index, Value* in_value);
 
@@ skipping 63 matching lines @@
 }
 
 BASE_EXPORT inline std::ostream& operator<<(std::ostream& out,
                                             const ListValue& value) {
   return out << static_cast<const Value&>(value);
 }
 
 }  // namespace base
 
 #endif  // BASE_VALUES_H_