Remove remaining deprecated wstring methods from base/values.{cc,h}.

BUG=23581
TEST=builds and passes tests

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

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

1 files changed, 0 insertions, 63 deletions

diff --git a/base/values.cc b/base/values.cc
index 20e6175..926202e 100644
--- a/base/values.cc
+++ b/base/values.cc
@@ -224,14 +224,6 @@ StringValue::StringValue(const string16& in_value)
       value_(UTF16ToUTF8(in_value)) {
 }
 
-#if !defined(WCHAR_T_IS_UTF16)
-// TODO(viettrungluu): Deprecated and to be removed:
-StringValue::StringValue(const std::wstring& in_value)
-    : Value(TYPE_STRING),
-      value_(WideToUTF8(in_value)) {
-}
-#endif
-
 StringValue::~StringValue() {
 }
 
@@ -360,11 +352,6 @@ bool DictionaryValue::HasKey(const std::string& key) const {
   return current_entry != dictionary_.end();
 }
 
-// TODO(viettrungluu): Deprecated and to be removed:
-bool DictionaryValue::HasKey(const std::wstring& key) const {
-  return HasKey(WideToUTF8(key));
-}
-
 void DictionaryValue::Clear() {
   ValueMap::iterator dict_iterator = dictionary_.begin();
   while (dict_iterator != dictionary_.end()) {
@@ -399,11 +386,6 @@ void DictionaryValue::Set(const std::string& path, Value* in_value) {
   current_dictionary->SetWithoutPathExpansion(current_path, in_value);
 }
 
-// TODO(viettrungluu): Deprecated and to be removed:
-void DictionaryValue::Set(const std::wstring& path, Value* in_value) {
-  Set(WideToUTF8(path), in_value);
-}
-
 void DictionaryValue::SetBoolean(const std::string& path, bool in_value) {
   Set(path, CreateBooleanValue(in_value));
 }
@@ -426,41 +408,6 @@ void DictionaryValue::SetString(const std::string& path,
   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(WideToUTF8(path), CreateStringValue(WideToUTF8(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
@@ -492,11 +439,6 @@ bool DictionaryValue::Get(const std::string& path, Value** out_value) const {
   return current_dictionary->GetWithoutPathExpansion(current_path, out_value);
 }
 
-// TODO(viettrungluu): Deprecated and to be removed:
-bool DictionaryValue::Get(const std::wstring& path, Value** out_value) const {
-  return Get(WideToUTF8(path), out_value);
-}
-
 bool DictionaryValue::GetBoolean(const std::string& path,
                                  bool* bool_value) const {
   Value* value;
@@ -681,11 +623,6 @@ bool DictionaryValue::Remove(const std::string& path, Value** out_value) {
                                                         out_value);
 }
 
-// TODO(viettrungluu): Deprecated and to be removed:
-bool DictionaryValue::Remove(const std::wstring& path, Value** out_value) {
-  return Remove(WideToUTF8(path), out_value);
-}
-
 bool DictionaryValue::RemoveWithoutPathExpansion(const std::string& key,
                                                  Value** out_value) {
   DCHECK(IsStringUTF8(key));