Remove wstring from l10n_util. Part 1....

app/table_model.cc

 // Copyright (c) 2009 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 "app/table_model.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_collator.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 36 matching lines @@
 // It's common (but not required) to use the title's IDS_* tag as the column
 // id. In this case, the provided conveniences look up the title string on
 // bahalf of the caller.
 TableColumn::TableColumn(int id, Alignment alignment, int width)
     : id(id),
       alignment(alignment),
       width(width),
       percent(0),
       min_visible_width(0),
       sortable(false) {
-  title = l10n_util::GetString(id);
+  title = UTF16ToWide(l10n_util::GetStringUTF16(id));
 }
 
 TableColumn::TableColumn(int id, Alignment alignment, int width, float percent)
     : id(id),
       alignment(alignment),
       width(width),
       percent(percent),
       min_visible_width(0),
       sortable(false) {
-  title = l10n_util::GetString(id);
+  title = UTF16ToWide(l10n_util::GetStringUTF16(id));
 }
 
 // TableModel -----------------------------------------------------------------
 
 // Used for sorting.
 static icu::Collator* collator = NULL;
 
 SkBitmap TableModel::GetIcon(int row) {
   return SkBitmap();
 }
@@ skipping 47 matching lines @@
       NOTREACHED();
     }
   }
   return collator;
 }
 
 void TableModel::ClearCollator() {
   delete collator;
   collator = NULL;
 }