Added std::string to Value via Set/GetString overloading.

All input is converted to UTF-8.  Output is converted back to wide during std::wstring version of GetString().

This is part one of some more patches to come where I switch clients over to UTF-8 strings.

Review URL: http://codereview.chromium.org/13230

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6768 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 99 insertions, 9 deletions

diff --git a/base/values.cc b/base/values.cc
index dd8062b..75b8e4f 100644
--- a/base/values.cc
+++ b/base/values.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
+#include "base/string_util.h"
 #include "base/values.h"
 
 ///////////////////// Value ////////////////////
@@ -31,6 +32,11 @@ Value* Value::CreateRealValue(double in_value) {
 }
 
 // static
+Value* Value::CreateStringValue(const std::string& in_value) {
+  return new StringValue(in_value);
+}
+
+// static
 Value* Value::CreateStringValue(const std::wstring& in_value) {
   return new StringValue(in_value);
 }
@@ -52,6 +58,10 @@ bool Value::GetAsReal(double* in_value) const {
   return false;
 }
 
+bool Value::GetAsString(std::string* in_value) const {
+  return false;
+}
+
 bool Value::GetAsString(std::wstring* in_value) const {
   return false;
 }
@@ -135,15 +145,32 @@ bool FundamentalValue::Equals(const Value* other) const {
 
 ///////////////////// StringValue ////////////////////
 
+StringValue::StringValue(const std::string& in_value)
+    : Value(TYPE_STRING),
+      value_(in_value) {
+  DCHECK(IsStringUTF8(in_value));
+}
+
+StringValue::StringValue(const std::wstring& in_value)
+    : Value(TYPE_STRING),
+      value_(WideToUTF8(in_value)) {
+}
+
 StringValue::~StringValue() {
 }
 
-bool StringValue::GetAsString(std::wstring* out_value) const {
+bool StringValue::GetAsString(std::string* out_value) const {
   if (out_value)
     *out_value = value_;
   return true;
 }
 
+bool StringValue::GetAsString(std::wstring* out_value) const {
+  if (out_value)
+    *out_value = UTF8ToWide(value_);
+  return true;
+}
+
 Value* StringValue::DeepCopy() const {
   return CreateStringValue(value_);
 }
@@ -151,7 +178,7 @@ Value* StringValue::DeepCopy() const {
 bool StringValue::Equals(const Value* other) const {
   if (other->GetType() != GetType())
     return false;
-  std::wstring lhs, rhs;
+  std::string lhs, rhs;
   return GetAsString(&lhs) && other->GetAsString(&rhs) && lhs == rhs;
 }
 
@@ -276,6 +303,11 @@ bool DictionaryValue::SetReal(const std::wstring& path, double in_value) {
 }
 
 bool DictionaryValue::SetString(const std::wstring& path,
+                                const std::string& in_value) {
+  return Set(path, CreateStringValue(in_value));
+}
+
+bool DictionaryValue::SetString(const std::wstring& path,
                                 const std::wstring& in_value) {
   return Set(path, CreateStringValue(in_value));
 }
@@ -335,6 +367,15 @@ bool DictionaryValue::GetReal(const std::wstring& path,
 }
 
 bool DictionaryValue::GetString(const std::wstring& path,
+                                std::string* out_value) const {
+  Value* value;
+  if (!Get(path, &value))
+    return false;
+
+  return value->GetAsString(out_value);
+}
+
+bool DictionaryValue::GetString(const std::wstring& path,
                                 std::wstring* out_value) const {
   Value* value;
   if (!Get(path, &value))
diff --git a/base/values.h b/base/values.h
index 4786ff6..2f28f11 100644
--- a/base/values.h
+++ b/base/values.h
@@ -52,6 +52,7 @@ class Value {
   static Value* CreateBooleanValue(bool in_value);
   static Value* CreateIntegerValue(int in_value);
   static Value* CreateRealValue(double in_value);
+  static Value* CreateStringValue(const std::string& in_value);
   static Value* CreateStringValue(const std::wstring& in_value);
 
   // This one can return NULL if the input isn't valid.  If the return value
@@ -86,6 +87,7 @@ class Value {
   virtual bool GetAsBoolean(bool* out_value) const;
   virtual bool GetAsInteger(int* out_value) const;
   virtual bool GetAsReal(double* out_value) const;
+  virtual bool GetAsString(std::string* out_value) const;
   virtual bool GetAsString(std::wstring* out_value) const;
 
   // This creates a deep copy of the entire Value tree, and returns a pointer
@@ -137,11 +139,16 @@ class FundamentalValue : public Value {
 
 class StringValue : public Value {
  public:
-  StringValue(const std::wstring& in_value)
-    : Value(TYPE_STRING), value_(in_value) {}
+  // Initializes a StringValue with a UTF-8 narrow character string.
+  StringValue(const std::string& in_value);
+
+  // Initializes a StringValue with a wide character string.
+  StringValue(const std::wstring& in_value);
+
   ~StringValue();
 
   // Subclassed methods
+  bool GetAsString(std::string* out_value) const;
   bool GetAsString(std::wstring* out_value) const;
   Value* DeepCopy() const;
   virtual bool Equals(const Value* other) const;
@@ -149,7 +156,7 @@ class StringValue : public Value {
  private:
   DISALLOW_EVIL_CONSTRUCTORS(StringValue);
 
-  std::wstring value_;
+  std::string value_;
 };
 
 class BinaryValue: public Value {
@@ -216,6 +223,7 @@ class DictionaryValue : public Value {
   bool SetBoolean(const std::wstring& path, bool in_value);
   bool SetInteger(const std::wstring& path, int in_value);
   bool SetReal(const std::wstring& path, double in_value);
+  bool SetString(const std::wstring& path, const std::string& in_value);
   bool SetString(const std::wstring& path, const std::wstring& in_value);
 
   // Gets the Value associated with the given path starting from this object.
@@ -233,6 +241,7 @@ class DictionaryValue : public Value {
   bool GetBoolean(const std::wstring& path, bool* out_value) const;
   bool GetInteger(const std::wstring& path, int* out_value) const;
   bool GetReal(const std::wstring& path, double* out_value) const;
+  bool GetString(const std::wstring& path, std::string* out_value) const;
   bool GetString(const std::wstring& path, std::wstring* out_value) const;
   bool GetBinary(const std::wstring& path, BinaryValue** out_value) const;
   bool GetDictionary(const std::wstring& path,
diff --git a/base/values_unittest.cc b/base/values_unittest.cc
index 67515ec..1a78089 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc
@@ -93,6 +93,30 @@ TEST(ValuesTest, BinaryValue) {
   delete binary;
 }
 
+TEST(ValuesTest, StringValue) {
+  // Test overloaded CreateStringValue.
+  Value* narrow_value = Value::CreateStringValue("narrow");
+  ASSERT_TRUE(narrow_value);
+  ASSERT_TRUE(narrow_value->IsType(Value::TYPE_STRING));
+  Value* wide_value = Value::CreateStringValue(L"wide");
+  ASSERT_TRUE(wide_value);
+  ASSERT_TRUE(wide_value->IsType(Value::TYPE_STRING));
+
+  // Test overloaded GetString.
+  std::string narrow = "http://google.com";
+  std::wstring wide = L"http://google.com";
+  ASSERT_TRUE(narrow_value->GetAsString(&narrow));
+  ASSERT_TRUE(narrow_value->GetAsString(&wide));
+  ASSERT_EQ(std::string("narrow"), narrow);
+  ASSERT_EQ(std::wstring(L"narrow"), wide);
+  ASSERT_TRUE(wide_value->GetAsString(&narrow));
+  ASSERT_TRUE(wide_value->GetAsString(&wide));
+  ASSERT_EQ(std::string("wide"), narrow);
+  ASSERT_EQ(std::wstring(L"wide"), wide);
+  delete narrow_value;
+  delete wide_value;
+}
+
 // This is a Value object that allows us to tell if it's been
 // properly deleted by modifying the value of external flag on destruction.
 class DeletionTestValue : public Value {
@@ -242,8 +266,10 @@ TEST(ValuesTest, DeepCopy) {
   original_dict.Set(L"int", original_int);
   Value* original_real = Value::CreateRealValue(3.14);
   original_dict.Set(L"real", original_real);
-  Value* original_string = Value::CreateStringValue(L"peek-a-boo");
+  Value* original_string = Value::CreateStringValue("hello");
   original_dict.Set(L"string", original_string);
+  Value* original_wstring = Value::CreateStringValue(L"peek-a-boo");
+  original_dict.Set(L"wstring", original_wstring);
 
   char* original_buffer = new char[42];
   memset(original_buffer, '!', 42);
@@ -300,9 +326,22 @@ TEST(ValuesTest, DeepCopy) {
   ASSERT_TRUE(copy_string);
   ASSERT_NE(copy_string, original_string);
   ASSERT_TRUE(copy_string->IsType(Value::TYPE_STRING));
-  std::wstring copy_string_value;
+  std::string copy_string_value;
+  std::wstring copy_wstring_value;
   ASSERT_TRUE(copy_string->GetAsString(&copy_string_value));
-  ASSERT_EQ(std::wstring(L"peek-a-boo"), copy_string_value);
+  ASSERT_TRUE(copy_string->GetAsString(&copy_wstring_value));
+  ASSERT_EQ(std::string("hello"), copy_string_value);
+  ASSERT_EQ(std::wstring(L"hello"), copy_wstring_value);
+
+  Value* copy_wstring = NULL;
+  ASSERT_TRUE(copy_dict->Get(L"wstring", &copy_wstring));
+  ASSERT_TRUE(copy_wstring);
+  ASSERT_NE(copy_wstring, original_wstring);
+  ASSERT_TRUE(copy_wstring->IsType(Value::TYPE_STRING));  
+  ASSERT_TRUE(copy_wstring->GetAsString(&copy_string_value));
+  ASSERT_TRUE(copy_wstring->GetAsString(&copy_wstring_value));
+  ASSERT_EQ(std::string("peek-a-boo"), copy_string_value);
+  ASSERT_EQ(std::wstring(L"peek-a-boo"), copy_wstring_value);
 
   Value* copy_binary = NULL;
   ASSERT_TRUE(copy_dict->Get(L"binary", &copy_binary));
@@ -360,7 +399,8 @@ TEST(ValuesTest, Equals) {
   dv.SetBoolean(L"a", false);
   dv.SetInteger(L"b", 2);
   dv.SetReal(L"c", 2.5);
-  dv.SetString(L"d", L"string");
+  dv.SetString(L"d1", "string");
+  dv.SetString(L"d2", L"string");
   dv.Set(L"e", Value::CreateNullValue());
 
   DictionaryValue* copy = static_cast<DictionaryValue*>(dv.DeepCopy());