Remove wstring from TableModel....

chrome/browser/plugin_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/plugin_exceptions_table_model.h"
 
 #include "app/l10n_util.h"
 #include "app/table_model_observer.h"
 #include "base/auto_reset.h"
 #include "base/sys_string_conversions.h"
@@ skipping 57 matching lines @@
 
   ClearSettings();
   if (observer_)
     observer_->OnModelChanged();
 }
 
 int PluginExceptionsTableModel::RowCount() {
   return settings_.size();
 }
 
-std::wstring PluginExceptionsTableModel::GetText(int row, int column_id) {
+string16 PluginExceptionsTableModel::GetText(int row, int column_id) {
   DCHECK_GE(row, 0);
   DCHECK_LT(row, static_cast<int>(settings_.size()));
   SettingsEntry& entry = settings_[row];
   switch (column_id) {
     case IDS_EXCEPTIONS_PATTERN_HEADER:
     case IDS_EXCEPTIONS_HOSTNAME_HEADER:
-      return UTF8ToWide(entry.pattern.AsString());
+      return UTF8ToUTF16(entry.pattern.AsString());
 
     case IDS_EXCEPTIONS_ACTION_HEADER:
       switch (entry.setting) {
         case CONTENT_SETTING_ALLOW:
-          return UTF16ToWideHack(
-              l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON));
+          return l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON);
         case CONTENT_SETTING_BLOCK:
-          return UTF16ToWideHack(
-              l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON));
+          return l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON);
         default:
           NOTREACHED();
       }
       break;
 
     default:
       NOTREACHED();
   }
 
-  return std::wstring();
+  return string16();
 }
 
 bool PluginExceptionsTableModel::HasGroups() {
   return true;
 }
 
 void PluginExceptionsTableModel::SetObserver(TableModelObserver* observer) {
   observer_ = observer;
 }
 
@@ skipping 34 matching lines @@
     HostContentSettingsMap::SettingsForOneType settings;
     map_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
                                 plugin,
                                 &settings);
     HostContentSettingsMap::SettingsForOneType otr_settings;
     if (otr_map_) {
       otr_map_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
                                       plugin,
                                       &otr_settings);
     }
-    std::wstring title = UTF16ToWide(plugins[i].GetGroupName());
+    string16 title = plugins[i].GetGroupName();
     for (HostContentSettingsMap::SettingsForOneType::iterator setting_it =
              settings.begin(); setting_it != settings.end(); ++setting_it) {
       SettingsEntry entry = {
         setting_it->first,
         group_id,
         setting_it->second,
         false
       };
       settings_.push_back(entry);
     }
@@ skipping 19 matching lines @@
 }
 
 void PluginExceptionsTableModel::ReloadSettings() {
   ClearSettings();
   LoadSettings();
 
   if (observer_)
     observer_->OnModelChanged();
 }