Remove wstring from TableModel....

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 120 matching lines @@
   entries_.clear();
   map_->ResetToDefault();
   if (observer_)
     observer_->OnItemsRemoved(0, old_row_count);
 }
 
 int GeolocationExceptionsTableModel::RowCount() {
   return entries_.size();
 }
 
-std::wstring GeolocationExceptionsTableModel::GetText(int row,
-                                                      int column_id) {
+string16 GeolocationExceptionsTableModel::GetText(int row,
+                                                  int column_id) {
   const Entry& entry = entries_[row];
   if (column_id == IDS_EXCEPTIONS_HOSTNAME_HEADER) {
     if (entry.origin == entry.embedding_origin) {
-      return content_settings_helper::OriginToWString(entry.origin);
+      return content_settings_helper::OriginToString16(entry.origin);
     }
-    std::wstring indent(L"    ");
+    string16 indent(ASCIIToUTF16("    "));
     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 + UTF16ToWideHack(l10n_util::GetStringUTF16(
-          IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ANY_OTHER));
+      return indent + l10n_util::GetStringUTF16(
+          IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ANY_OTHER);
     }
-    return indent + UTF16ToWideHack(l10n_util::GetStringFUTF16(
+    return indent + l10n_util::GetStringFUTF16(
         IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST,
-        WideToUTF16Hack(
-          content_settings_helper::OriginToWString(entry.embedding_origin))));
+        content_settings_helper::OriginToString16(entry.embedding_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);
       case CONTENT_SETTING_ASK:
-        return UTF16ToWideHack(
-            l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ASK_BUTTON));
+        return l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ASK_BUTTON);
       case CONTENT_SETTING_DEFAULT:
-        return UTF16ToWideHack(
-            l10n_util::GetStringUTF16(IDS_EXCEPTIONS_NOT_SET_BUTTON));
+        return l10n_util::GetStringUTF16(IDS_EXCEPTIONS_NOT_SET_BUTTON);
       default:
         break;
     }
   }
 
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
 void GeolocationExceptionsTableModel::SetObserver(
     TableModelObserver* observer) {
   observer_ = observer;
 }
 
 int GeolocationExceptionsTableModel::CompareValues(int row1,
                                                    int row2,
                                                    int column_id) {
@@ skipping 26 matching lines @@
     // origins will compare.
     while (entries_[row1].origin != entries_[row1].embedding_origin)
       --row1;
     while (entries_[row2].origin != entries_[row2].embedding_origin)
       --row2;
   }
 
   // The entries are at the same "scope".  If we're sorting by action, then do
   // that now.
   if (column_id == IDS_EXCEPTIONS_ACTION_HEADER) {
-    int compare_text = l10n_util::CompareStringWithCollator(
+    int compare_text = l10n_util::CompareString16WithCollator(
         GetCollator(), GetText(row1, column_id), GetText(row2, column_id));
     if (compare_text != 0)
       return compare_text;
   }
 
   // Sort by the relevant origin.
   return origin_comparison;
 }
 
 void GeolocationExceptionsTableModel::AddEntriesForOrigin(
     const GURL& origin,
     const GeolocationContentSettingsMap::OneOriginSettings& settings) {
   GeolocationContentSettingsMap::OneOriginSettings::const_iterator parent =
       settings.find(origin);
 
   // Add the "parent" entry for the non-embedded setting.
   entries_.push_back(Entry(origin, origin,
       (parent == settings.end()) ? CONTENT_SETTING_DEFAULT : parent->second));
 
   // 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));
   }
 }