Convert DictionaryValue's keys to std::string (from wstring).

Everything now needs to be changed to avoid the deprecated wstring methods; this
includes the unit tests.

BUG=23581
TEST=all our tests still pass

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

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

2 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/geolocation/access_token_store.cc b/chrome/browser/geolocation/access_token_store.cc
index b0d2d5e..f790c51 100644
--- a/chrome/browser/geolocation/access_token_store.cc
+++ b/chrome/browser/geolocation/access_token_store.cc
@@ -47,7 +47,7 @@ void ChromePrefsAccessTokenStore::LoadDictionaryStoreInUIThread(
   if (token_dictionary != NULL) {
     for (DictionaryValue::key_iterator it = token_dictionary->begin_keys();
         it != token_dictionary->end_keys(); ++it) {
-      GURL url(WideToUTF8(*it));
+      GURL url(*it);
       if (!url.is_valid())
         continue;
       token_dictionary->GetStringAsUTF16WithoutPathExpansion(
diff --git a/chrome/browser/geolocation/geolocation_content_settings_map.cc b/chrome/browser/geolocation/geolocation_content_settings_map.cc
index 2723870..77fb103 100644
--- a/chrome/browser/geolocation/geolocation_content_settings_map.cc
+++ b/chrome/browser/geolocation/geolocation_content_settings_map.cc
@@ -92,13 +92,13 @@ GeolocationContentSettingsMap::AllOriginsSettings
   if (all_settings_dictionary != NULL) {
     for (DictionaryValue::key_iterator i(all_settings_dictionary->begin_keys());
          i != all_settings_dictionary->end_keys(); ++i) {
-      const std::wstring& wide_origin(*i);
-      GURL origin_as_url(WideToUTF8(wide_origin));
+      const std::string& origin(*i);
+      GURL origin_as_url(origin);
       if (!origin_as_url.is_valid())
         continue;
       DictionaryValue* requesting_origin_settings_dictionary = NULL;
       bool found = all_settings_dictionary->GetDictionaryWithoutPathExpansion(
-          wide_origin, &requesting_origin_settings_dictionary);
+          origin, &requesting_origin_settings_dictionary);
       DCHECK(found);
       if (!requesting_origin_settings_dictionary)
         continue;
@@ -177,11 +177,11 @@ void GeolocationContentSettingsMap::GetOneOriginSettingsFromDictionary(
     OneOriginSettings* one_origin_settings) {
   for (DictionaryValue::key_iterator i(dictionary->begin_keys());
        i != dictionary->end_keys(); ++i) {
-    const std::wstring& target(*i);
+    const std::string& target(*i);
     int setting = kDefaultSetting;
     bool found = dictionary->GetIntegerWithoutPathExpansion(target, &setting);
     DCHECK(found);
-    GURL target_url(WideToUTF8(target));
+    GURL target_url(target);
     // An empty URL has a special meaning (wildcard), so only accept invalid
     // URLs if the original version was empty (avoids treating corrupted prefs
     // as the wildcard entry; see http://crbug.com/39685)