Inline StringValue into base::Value

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 12 matching lines @@
 #include <iosfwd>
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/base_export.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
+#include "base/memory/manual_constructor.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 
 namespace base {
 
 class BinaryValue;
 class DictionaryValue;
 class FundamentalValue;
 class ListValue;
 class StringValue;
@@ skipping 42 matching lines @@
   bool is_double() const { return type() == TYPE_DOUBLE; }
   bool is_string() const { return type() == TYPE_STRING; }
   bool is_blob() const { return type() == TYPE_BINARY; }
   bool is_dict() const { return type() == TYPE_DICTIONARY; }
   bool is_list() const { return type() == TYPE_LIST; }
 
   // These will all fatally assert if the type doesn't match.
   bool GetBool() const;
   int GetInt() const;
   double GetDouble() const;  // Implicitly converts from int if necessary.
+  // Returns |string_value_| as a pointer or reference.
+  std::string* GetString();
+  const std::string& GetString() const;
 
   // 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;
@@ skipping 26 matching lines @@
  protected:
   // These aren't safe for end-users, but they are useful for subclasses.
   explicit Value(Type type);
   Value(const Value& that);
   Value& operator=(const Value& that);
 
   // TODO(brettw) move to public when FundamentalValue is gone.
   Value(bool in_bool);
   Value(int in_int);
   Value(double in_double);
+  // TODO(jdoerrie) move to public when StringValue is gone.
+  Value(const char* in_string);  // Value(bool in_bool) shadows otherwise
+  Value(StringPiece in_string);
+  Value(const string16& in_string);
 
  private:
   Type type_;
 
   union {
     bool bool_value_;
     int int_value_;
     double double_value_;
+    ManualConstructor<std::string> string_value_;
   };
 };
 
 // FundamentalValue represents the simple fundamental types of values.
 // TODO(brettw) remove when callers are updated to use raw Value.
 class BASE_EXPORT FundamentalValue : public Value {
  public:
   explicit FundamentalValue(bool in_value);
   explicit FundamentalValue(int in_value);
   explicit FundamentalValue(double in_value);
   ~FundamentalValue() override;
 };
 
+// TODO(jdoerrie) remove when callers are updated to use raw Value.
 class BASE_EXPORT StringValue : public Value {
  public:
   // Initializes a StringValue with a UTF-8 narrow character string.
   explicit StringValue(StringPiece in_value);
 
   // Initializes a StringValue with a string16.
   explicit StringValue(const string16& in_value);
 
   ~StringValue() override;
-
-  // Returns |value_| as a pointer or reference.
-  std::string* GetString();
-  const std::string& GetString() const;
-
-  // Overridden from Value:
-  bool GetAsString(std::string* out_value) const override;
-  bool GetAsString(string16* out_value) const override;
-  bool GetAsString(const StringValue** out_value) const override;
-  StringValue* DeepCopy() const override;
-  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.
   BinaryValue();
 
   // Creates a BinaryValue, taking ownership of the bytes pointed to by
   // |buffer|.
   BinaryValue(std::unique_ptr<char[]> buffer, size_t size);
@@ skipping 374 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_