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

base/values.h

 // 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.
 
 // This file specifies a recursive data storage class called Value intended for
 // storing setting and other persistable data.  It includes the ability to
 // specify (recursive) lists and dictionaries, so it's fairly expressive.
 // However, the API is optimized for the common case, namely storing a
 // hierarchical tree of simple values.  Given a DictionaryValue root, you can
 // easily do things like:
@@ skipping 235 matching lines @@
   // |in_value|, and therefore |in_value| must be non-NULL.
   void Set(const std::string& path, Value* in_value);
   /*DEPRECATED*/void Set(const std::wstring& 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 SetReal(const std::string& path, double in_value);
   void SetString(const std::string& path, const std::string& in_value);
-  void SetStringFromUTF16(const std::string& path, const string16& in_value);
+  void SetString(const std::string& path, const string16& in_value);
   /*DEPRECATED*/void SetBoolean(const std::wstring& path, bool in_value);
   /*DEPRECATED*/void SetInteger(const std::wstring& path, int in_value);
   /*DEPRECATED*/void SetReal(const std::wstring& path, double in_value);
   /*DEPRECATED*/void SetString(const std::wstring& path,
                                const std::string& in_value);
   /*DEPRECATED*/void SetString(const std::wstring& path,
+                               const string16& in_value);
+#if !defined(WCHAR_T_IS_UTF16)
+  /*DEPRECATED*/void SetString(const std::wstring& path,
                                const std::wstring& in_value);
-  /*DEPRECATED*/void SetStringFromUTF16(const std::wstring& path,
-                                        const string16& in_value);
+#endif
 
   // 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);
   /*DEPRECATED*/void SetWithoutPathExpansion(const std::wstring& key,
                                              Value* in_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
@@ skipping 215 matching lines @@
   // This method deserializes the subclass-specific format into a Value object.
   // If the return value is non-NULL, the caller takes ownership of returned
   // Value. If the return value is NULL, and if error_code is non-NULL,
   // error_code will be set with the underlying error.
   // If |error_message| is non-null, it will be filled in with a formatted
   // error message including the location of the error if appropriate.
   virtual Value* Deserialize(int* error_code, std::string* error_str) = 0;
 };
 
 #endif  // BASE_VALUES_H_