Rename GetStringAsUTF16() to GetString() (and overload), etc.

Also do some drive-by wstring/wchar_t -> string/char changes (in addition to the
necessary ones).

BUG=none
TEST=builds and tests pass

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

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

1 files changed, 8 insertions, 24 deletions

diff --git a/base/values.cc b/base/values.cc
index af801bc..78547a4 100644
--- a/base/values.cc
+++ b/base/values.cc
@@ -565,8 +565,8 @@ bool DictionaryValue::GetString(const std::string& path,
   return value->GetAsString(out_value);
 }
 
-bool DictionaryValue::GetStringAsUTF16(const std::string& path,
-                                       string16* out_value) const {
+bool DictionaryValue::GetString(const std::string& path,
+                                string16* out_value) const {
   Value* value;
   if (!Get(path, &value))
     return false;
@@ -646,12 +646,6 @@ bool DictionaryValue::GetReal(const std::wstring& path,
   return GetReal(WideToUTF8(path), out_value);
 }
 
-// TODO(viettrungluu): or maybe we should get rid of the "AsUTF16" version?
-bool DictionaryValue::GetString(const std::string& path,
-                                string16* out_value) const {
-  return GetStringAsUTF16(path, out_value);
-}
-
 // TODO(viettrungluu): Deprecated and to be removed:
 bool DictionaryValue::GetString(const std::wstring& path,
                                 std::string* out_value) const {
@@ -669,12 +663,6 @@ bool DictionaryValue::GetString(const std::wstring& path,
 }
 
 // TODO(viettrungluu): Deprecated and to be removed:
-bool DictionaryValue::GetStringAsUTF16(const std::wstring& path,
-                                       string16* out_value) const {
-  return GetStringAsUTF16(WideToUTF8(path), out_value);
-}
-
-// TODO(viettrungluu): Deprecated and to be removed:
 bool DictionaryValue::GetBinary(const std::wstring& path,
                                 BinaryValue** out_value) const {
   return GetBinary(WideToUTF8(path), out_value);
@@ -723,7 +711,7 @@ bool DictionaryValue::GetStringWithoutPathExpansion(
   return value->GetAsString(out_value);
 }
 
-bool DictionaryValue::GetStringAsUTF16WithoutPathExpansion(
+bool DictionaryValue::GetStringWithoutPathExpansion(
     const std::string& key,
     string16* out_value) const {
   Value* value;
@@ -791,13 +779,6 @@ bool DictionaryValue::GetStringWithoutPathExpansion(
 }
 
 // TODO(viettrungluu): Deprecated and to be removed:
-bool DictionaryValue::GetStringAsUTF16WithoutPathExpansion(
-    const std::wstring& key,
-    string16* out_value) const {
-  return GetStringAsUTF16WithoutPathExpansion(WideToUTF8(key), out_value);
-}
-
-// TODO(viettrungluu): Deprecated and to be removed:
 bool DictionaryValue::GetDictionaryWithoutPathExpansion(
     const std::wstring& key,
     DictionaryValue** out_value) const {
@@ -1058,7 +1039,7 @@ bool ListValue::GetString(size_t index, std::string* out_value) const {
   return value->GetAsString(out_value);
 }
 
-bool ListValue::GetString(size_t index, std::wstring* out_value) const {
+bool ListValue::GetString(size_t index, string16* out_value) const {
   Value* value;
   if (!Get(index, &value))
     return false;
@@ -1066,13 +1047,16 @@ bool ListValue::GetString(size_t index, std::wstring* out_value) const {
   return value->GetAsString(out_value);
 }
 
-bool ListValue::GetStringAsUTF16(size_t index, string16* out_value) const {
+#if !defined(WCHAR_T_IS_UTF16)
+// TODO(viettrungluu): Deprecated and to be removed:
+bool ListValue::GetString(size_t index, std::wstring* out_value) const {
   Value* value;
   if (!Get(index, &value))
     return false;
 
   return value->GetAsString(out_value);
 }
+#endif
 
 bool ListValue::GetBinary(size_t index, BinaryValue** out_value) const {
   Value* value;