Remove wstring from l10n_util. Part 2....

chrome/browser/geolocation/geolocation_exceptions_table_model.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 "chrome/browser/geolocation/geolocation_exceptions_table_model.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_collator.h"
 #include "app/table_model_observer.h"
 #include "base/utf_string_conversions.h"
@@ skipping 134 matching lines @@
     if (entry.origin == entry.embedding_origin) {
       return content_settings_helper::OriginToWString(entry.origin);
     }
     std::wstring indent(L"    ");
     if (entry.embedding_origin.is_empty()) {
       // NOTE: As long as the user cannot add/edit entries from the exceptions
       // dialog, it's impossible to actually have a non-default setting for some
       // origin "embedded on any other site", so this row will never appear.  If
       // we add the ability to add/edit exceptions, we'll need to decide when to
       // display this and how "removing" it will function.
-      return indent +
-          l10n_util::GetString(IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ANY_OTHER);
+      return indent + UTF16ToWideHack(l10n_util::GetStringUTF16(
+          IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ANY_OTHER));
     }
-    return indent + l10n_util::GetStringF(
+    return indent + UTF16ToWideHack(l10n_util::GetStringFUTF16(
         IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST,
-        content_settings_helper::OriginToWString(entry.embedding_origin));
+        WideToUTF16Hack(
+          content_settings_helper::OriginToWString(entry.embedding_origin))));
   }
 
   if (column_id == IDS_EXCEPTIONS_ACTION_HEADER) {
     switch (entry.setting) {
       case CONTENT_SETTING_ALLOW:
-        return l10n_util::GetString(IDS_EXCEPTIONS_ALLOW_BUTTON);
+        return UTF16ToWideHack(
+            l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON));
       case CONTENT_SETTING_BLOCK:
-        return l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON);
+        return UTF16ToWideHack(
+            l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON));
       case CONTENT_SETTING_ASK:
-        return l10n_util::GetString(IDS_EXCEPTIONS_ASK_BUTTON);
+        return UTF16ToWideHack(
+            l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ASK_BUTTON));
       case CONTENT_SETTING_DEFAULT:
-        return l10n_util::GetString(IDS_EXCEPTIONS_NOT_SET_BUTTON);
+        return UTF16ToWideHack(
+            l10n_util::GetStringUTF16(IDS_EXCEPTIONS_NOT_SET_BUTTON));
       default:
         break;
     }
   }
 
   NOTREACHED();
   return std::wstring();
 }
 
 void GeolocationExceptionsTableModel::SetObserver(
@@ skipping 63 matching lines @@
   // Add the "children" for any embedded settings.
   GeolocationContentSettingsMap::OneOriginSettings::const_iterator i;
   for (i = settings.begin(); i != settings.end(); ++i) {
     // Skip the non-embedded setting which we already added above.
     if (i == parent)
       continue;
 
     entries_.push_back(Entry(origin, i->first, i->second));
   }
 }