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

base/values.h

Index: base/values.h
diff --git a/base/values.h b/base/values.h
index d99a46fa13b692516035bd30b6e6382a75c516ee..0c0ed9149444676d20dee275411e1692ca96d5fd 100644
--- a/base/values.h
+++ b/base/values.h
@@ -253,16 +253,18 @@ class DictionaryValue : public 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.