Remove remaining deprecated wstring DictionaryValue::Get...WithoutPathExpansion()s.

BUG=23581
TEST=builds and passes tests

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

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

3 files changed, 0 insertions, 41 deletions

diff --git a/base/values.cc b/base/values.cc
index c4f33c9..1a1695c 100644
--- a/base/values.cc
+++ b/base/values.cc
@@ -747,36 +747,6 @@ bool DictionaryValue::GetListWithoutPathExpansion(const std::string& key,
   return true;
 }
 
-// TODO(viettrungluu): Deprecated and to be removed:
-bool DictionaryValue::GetWithoutPathExpansion(const std::wstring& key,
-                                              Value** out_value) const {
-  return GetWithoutPathExpansion(WideToUTF8(key), out_value);
-}
-
-// TODO(viettrungluu): Deprecated and to be removed:
-bool DictionaryValue::GetIntegerWithoutPathExpansion(const std::wstring& key,
-                                                     int* out_value) const {
-  return GetIntegerWithoutPathExpansion(WideToUTF8(key), out_value);
-}
-
-// TODO(viettrungluu): Deprecated and to be removed:
-bool DictionaryValue::GetStringWithoutPathExpansion(
-    const std::wstring& key,
-    std::string* out_value) const {
-  return GetStringWithoutPathExpansion(WideToUTF8(key), out_value);
-}
-
-// TODO(viettrungluu): Deprecated and to be removed:
-bool DictionaryValue::GetStringWithoutPathExpansion(
-    const std::wstring& key,
-    std::wstring* out_value) const {
-  Value* value;
-  if (!GetWithoutPathExpansion(WideToUTF8(key), &value))
-    return false;
-
-  return value->GetAsString(out_value);
-}
-
 bool DictionaryValue::Remove(const std::string& path, Value** out_value) {
   DCHECK(IsStringUTF8(path));
   std::string current_path(path);
diff --git a/base/values.h b/base/values.h
index a750422..54230c9 100644
--- a/base/values.h
+++ b/base/values.h
@@ -323,14 +323,6 @@ class DictionaryValue : public Value {
                                          DictionaryValue** out_value) const;
   bool GetListWithoutPathExpansion(const std::string& key,
                                    ListValue** out_value) const;
-  /*DEPRECATED*/bool GetWithoutPathExpansion(const std::wstring& key,
-                                             Value** out_value) const;
-  /*DEPRECATED*/bool GetIntegerWithoutPathExpansion(const std::wstring& key,
-                                                    int* out_value) const;
-  /*DEPRECATED*/bool GetStringWithoutPathExpansion(
-                    const std::wstring& key, std::string* out_value) const;
-  /*DEPRECATED*/bool GetStringWithoutPathExpansion(
-                    const std::wstring& key, std::wstring* out_value) const;
 
   // Removes the Value with the specified path from this dictionary (or one
   // of its child dictionaries, if the path is more than just a local key).
diff --git a/base/values_unittest.cc b/base/values_unittest.cc
index 82d6082..81bd675 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc
@@ -508,9 +508,6 @@ TEST_F(ValuesTest, DictionaryWithoutPathExpansionDeprecated) {
   EXPECT_TRUE(dict.HasKey(L"this.isnt.expanded"));
   Value* value3;
   EXPECT_FALSE(dict.Get(L"this.isnt.expanded", &value3));
-  Value* value4;
-  ASSERT_TRUE(dict.GetWithoutPathExpansion(L"this.isnt.expanded", &value4));
-  EXPECT_EQ(Value::TYPE_NULL, value4->GetType());
 }
 
 TEST_F(ValuesTest, DeepCopy) {