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

base/values.cc

 // Copyright (c) 2010 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/values.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 
@@ skipping 430 matching lines @@
 
 void DictionaryValue::SetReal(const std::string& path, double in_value) {
   Set(path, CreateRealValue(in_value));
 }
 
 void DictionaryValue::SetString(const std::string& path,
                                 const std::string& in_value) {
   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));
 }
 
 // TODO(viettrungluu): Deprecated and to be removed:
 void DictionaryValue::SetBoolean(const std::wstring& path, bool in_value) {
   Set(path, CreateBooleanValue(in_value));
 }
 
 // TODO(viettrungluu): Deprecated and to be removed:
 void DictionaryValue::SetInteger(const std::wstring& path, int in_value) {
   Set(path, CreateIntegerValue(in_value));
 }
 
 // TODO(viettrungluu): Deprecated and to be removed:
 void DictionaryValue::SetReal(const std::wstring& path, double in_value) {
   Set(path, CreateRealValue(in_value));
 }
 
 // TODO(viettrungluu): Deprecated and to be removed:
 void DictionaryValue::SetString(const std::wstring& path,
                                 const std::string& in_value) {
   Set(path, CreateStringValue(in_value));
 }
 
 // TODO(viettrungluu): Deprecated and to be removed:
 void DictionaryValue::SetString(const std::wstring& path,
+                                const string16& in_value) {
+  Set(path, CreateStringValue(in_value));
+}
+
+#if !defined(WCHAR_T_IS_UTF16)
+// TODO(viettrungluu): Deprecated and to be removed:
+void DictionaryValue::SetString(const std::wstring& path,
                                 const std::wstring& in_value) {
   Set(path, CreateStringValue(in_value));
 }
-
-// TODO(viettrungluu): Deprecated and to be removed:
-void DictionaryValue::SetStringFromUTF16(const std::wstring& path,
-                                         const string16& in_value) {
-  Set(path, CreateStringValue(in_value));
-}
+#endif
 
 void DictionaryValue::SetWithoutPathExpansion(const std::string& key,
                                               Value* in_value) {
   // If there's an existing value here, we need to delete it, because
   // we own all our children.
   if (HasKey(key)) {
     DCHECK(dictionary_[key] != in_value);  // This would be bogus
     delete dictionary_[key];
   }
 
@@ skipping 579 matching lines @@
       return false;
   }
   if (lhs_it != end() || rhs_it != other_list->end())
     return false;
 
   return true;
 }
 
 ValueSerializer::~ValueSerializer() {
 }