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

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 547 matching lines @@
 
 bool DictionaryValue::GetString(const std::string& path,
                                 std::string* out_value) const {
   Value* value;
   if (!Get(path, &value))
     return false;
 
   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;
 
   return value->GetAsString(out_value);
 }
 
 bool DictionaryValue::GetStringASCII(const std::string& path,
                                      std::string* out_value) const {
   std::string out;
@@ skipping 59 matching lines @@
                                  int* out_value) const {
   return GetInteger(WideToUTF8(path), out_value);
 }
 
 // TODO(viettrungluu): Deprecated and to be removed:
 bool DictionaryValue::GetReal(const std::wstring& path,
                               double* out_value) const {
   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 {
   return GetString(WideToUTF8(path), out_value);
 }
 
 // TODO(viettrungluu): Deprecated and to be removed:
 bool DictionaryValue::GetString(const std::wstring& path,
                                 std::wstring* out_value) const {
   Value* value;
   if (!Get(WideToUTF8(path), &value))
     return false;
 
   return value->GetAsString(out_value);
 }
 
 // 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);
 }
 
 // TODO(viettrungluu): Deprecated and to be removed:
 bool DictionaryValue::GetDictionary(const std::wstring& path,
                                     DictionaryValue** out_value) const {
   return GetDictionary(WideToUTF8(path), out_value);
 }
@@ skipping 28 matching lines @@
 bool DictionaryValue::GetStringWithoutPathExpansion(
     const std::string& key,
     std::string* out_value) const {
   Value* value;
   if (!GetWithoutPathExpansion(key, &value))
     return false;
 
   return value->GetAsString(out_value);
 }
 
-bool DictionaryValue::GetStringAsUTF16WithoutPathExpansion(
+bool DictionaryValue::GetStringWithoutPathExpansion(
     const std::string& key,
     string16* out_value) const {
   Value* value;
   if (!GetWithoutPathExpansion(key, &value))
     return false;
 
   return value->GetAsString(out_value);
 }
 
 bool DictionaryValue::GetDictionaryWithoutPathExpansion(
@@ skipping 47 matching lines @@
     const std::wstring& key,
     std::wstring* out_value) const {
   Value* value;
   if (!GetWithoutPathExpansion(WideToUTF8(key), &value))
     return false;
 
   return value->GetAsString(out_value);
 }
 
 // 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 {
   return GetDictionaryWithoutPathExpansion(WideToUTF8(key), out_value);
 }
 
 // TODO(viettrungluu): Deprecated and to be removed:
 bool DictionaryValue::GetListWithoutPathExpansion(const std::wstring& key,
                                                   ListValue** out_value) const {
   return GetListWithoutPathExpansion(WideToUTF8(key), out_value);
@@ skipping 240 matching lines @@
 }
 
 bool ListValue::GetString(size_t index, std::string* out_value) const {
   Value* value;
   if (!Get(index, &value))
     return false;
 
   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;
 
   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;
   bool result = Get(index, &value);
   if (!result || !value->IsType(TYPE_BINARY))
     return false;
 
   if (out_value)
     *out_value = static_cast<BinaryValue*>(value);
 
@@ skipping 101 matching lines @@
       return false;
   }
   if (lhs_it != end() || rhs_it != other_list->end())
     return false;
 
   return true;
 }
 
 ValueSerializer::~ValueSerializer() {
 }