Remove wstring from l10n_util. Part 2....

chrome/browser/content_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/content_exceptions_table_model.h"
 
 #include "app/l10n_util.h"
 #include "app/table_model_observer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 92 matching lines @@
 std::wstring ContentExceptionsTableModel::GetText(int row, int column_id) {
   HostContentSettingsMap::PatternSettingPair entry = entry_at(row);
 
   switch (column_id) {
     case IDS_EXCEPTIONS_PATTERN_HEADER:
       return UTF8ToWide(entry.first.AsString());
 
     case IDS_EXCEPTIONS_ACTION_HEADER:
       switch (entry.second) {
         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_SESSION_ONLY:
-          return l10n_util::GetString(IDS_EXCEPTIONS_SESSION_ONLY_BUTTON);
+          return UTF16ToWideHack(
+              l10n_util::GetStringUTF16(IDS_EXCEPTIONS_SESSION_ONLY_BUTTON));
         default:
           NOTREACHED();
       }
       break;
 
     default:
       NOTREACHED();
   }
 
   return std::wstring();
 }
 
 void ContentExceptionsTableModel::SetObserver(TableModelObserver* observer) {
   observer_ = observer;
 }