Rename DictionaryValue's SetStringFromUTF16() to SetString() (and overload).

Also do a bunch of drive-by changes while I'm at it.

Still to do: rename GetStringAsUTF16() to GetString().

BUG=none
TEST=builds everywhere, tests pass

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

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

1 files changed, 7 insertions, 5 deletions

diff --git a/base/values.cc b/base/values.cc
index 8fdd4ea..af801bc 100644
--- a/base/values.cc
+++ b/base/values.cc
@@ -448,8 +448,8 @@ void DictionaryValue::SetString(const std::string& path,
   Set(path, CreateStringValue(in_value));
 }
 
-void DictionaryValue::SetStringFromUTF16(const std::string& path,
-                                         const string16& in_value) {
+void DictionaryValue::SetString(const std::string& path,
+                                const string16& in_value) {
   Set(path, CreateStringValue(in_value));
 }
 
@@ -476,15 +476,17 @@ void DictionaryValue::SetString(const std::wstring& path,
 
 // TODO(viettrungluu): Deprecated and to be removed:
 void DictionaryValue::SetString(const std::wstring& path,
-                                const std::wstring& in_value) {
+                                const string16& in_value) {
   Set(path, CreateStringValue(in_value));
 }
 
+#if !defined(WCHAR_T_IS_UTF16)
 // TODO(viettrungluu): Deprecated and to be removed:
-void DictionaryValue::SetStringFromUTF16(const std::wstring& path,
-                                         const string16& in_value) {
+void DictionaryValue::SetString(const std::wstring& path,
+                                const std::wstring& in_value) {
   Set(path, CreateStringValue(in_value));
 }
+#endif
 
 void DictionaryValue::SetWithoutPathExpansion(const std::string& key,
                                               Value* in_value) {