Remove wstring from TableModel....

chrome/browser/notifications/notification_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/notifications/notification_exceptions_table_model.h"
 
 #include "app/l10n_util.h"
 #include "app/table_model_observer.h"
 #include "base/auto_reset.h"
-// TODO(avi): remove when conversions not needed any more
-#include "base/utf_string_conversions.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_helper.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 
 struct NotificationExceptionsTableModel::Entry {
   Entry(const GURL& origin, ContentSetting setting);
@@ skipping 43 matching lines @@
   entries_.clear();
   service_->ResetAllOrigins();
   if (observer_)
     observer_->OnModelChanged();
 }
 
 int NotificationExceptionsTableModel::RowCount() {
   return static_cast<int>(entries_.size());
 }
 
-std::wstring NotificationExceptionsTableModel::GetText(int row,
-                                                       int column_id) {
+string16 NotificationExceptionsTableModel::GetText(int row,
+                                                   int column_id) {
   const Entry& entry = entries_[row];
   if (column_id == IDS_EXCEPTIONS_HOSTNAME_HEADER) {
-    return content_settings_helper::OriginToWString(entry.origin);
+    return content_settings_helper::OriginToString16(entry.origin);
   }
 
   if (column_id == 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:
         break;
     }
   }
 
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
 void NotificationExceptionsTableModel::SetObserver(
     TableModelObserver* observer) {
   observer_ = observer;
 }
 
 void NotificationExceptionsTableModel::Observe(
     NotificationType type,
     const NotificationSource& source,
@@ skipping 24 matching lines @@
     ContentSetting in_setting)
     : origin(in_origin),
       setting(in_setting) {
 }
 
 bool NotificationExceptionsTableModel::Entry::operator<(
     const NotificationExceptionsTableModel::Entry& b) const {
   DCHECK_NE(origin, b.origin);
   return origin < b.origin;
 }