Remove deprecated wstring DictionaryValue::Get{Dictionary,List}WithoutPathExpansion() overloads.

BUG=23581
TEST=builds and passes tests

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

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

3 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/background_contents_service.cc b/chrome/browser/background_contents_service.cc
index f9eb6f2..6a61112 100644
--- a/chrome/browser/background_contents_service.cc
+++ b/chrome/browser/background_contents_service.cc
@@ -214,7 +214,7 @@ void BackgroundContentsService::RegisterBackgroundContents(
       prefs::kRegisteredBackgroundContents);
   const string16& appid = GetParentApplicationId(background_contents);
   DictionaryValue* current;
-  if (pref->GetDictionaryWithoutPathExpansion(UTF16ToWide(appid), &current))
+  if (pref->GetDictionaryWithoutPathExpansion(UTF16ToUTF8(appid), &current))
     return;
 
   // No entry for this application yet, so add one.
diff --git a/chrome/browser/background_contents_service_unittest.cc b/chrome/browser/background_contents_service_unittest.cc
index 292d0b0..964d111 100644
--- a/chrome/browser/background_contents_service_unittest.cc
+++ b/chrome/browser/background_contents_service_unittest.cc
@@ -38,9 +38,9 @@ class BackgroundContentsServiceTest : public testing::Test {
     DictionaryValue* pref = GetPrefs(profile);
     EXPECT_TRUE(pref->HasKey(UTF16ToWide(appid)));
     DictionaryValue* value;
-    pref->GetDictionaryWithoutPathExpansion(UTF16ToWide(appid), &value);
+    pref->GetDictionaryWithoutPathExpansion(UTF16ToUTF8(appid), &value);
     std::string url;
-    value->GetString(L"url", &url);
+    value->GetString("url", &url);
     return url;
   }
 
diff --git a/chrome/browser/geolocation/geolocation_content_settings_map.cc b/chrome/browser/geolocation/geolocation_content_settings_map.cc
index 597d408..b9e84dc5 100644
--- a/chrome/browser/geolocation/geolocation_content_settings_map.cc
+++ b/chrome/browser/geolocation/geolocation_content_settings_map.cc
@@ -67,7 +67,7 @@ ContentSetting GeolocationContentSettingsMap::GetContentSetting(
   if (all_settings_dictionary != NULL) {
     DictionaryValue* requesting_origin_settings;
     if (all_settings_dictionary->GetDictionaryWithoutPathExpansion(
-        UTF8ToWide(requesting_origin.spec()), &requesting_origin_settings)) {
+        requesting_origin.spec(), &requesting_origin_settings)) {
       int setting;
       if (requesting_origin_settings->GetIntegerWithoutPathExpansion(
           UTF8ToWide(embedding_origin.spec()), &setting))
@@ -75,7 +75,7 @@ ContentSetting GeolocationContentSettingsMap::GetContentSetting(
       // Check for any-embedder setting
       if (requesting_origin != embedding_origin &&
           requesting_origin_settings->GetIntegerWithoutPathExpansion(
-          L"", &setting))
+          "", &setting))
         return IntToContentSetting(setting);
     }
   }