Remove wstring from TableModel....

chrome/browser/dom_ui/options/browser_options_handler.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/dom_ui/options/browser_options_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
@@ skipping 263 matching lines @@
       SessionStartupPref::GetStartupPref(profile->GetPrefs());
   startup_custom_pages_table_model_->SetURLs(startup_pref.urls);
 }
 
 void BrowserOptionsHandler::OnModelChanged() {
   ListValue startup_pages;
   int page_count = startup_custom_pages_table_model_->RowCount();
   std::vector<GURL> urls = startup_custom_pages_table_model_->GetURLs();
   for (int i = 0; i < page_count; ++i) {
     DictionaryValue* entry = new DictionaryValue();
-    entry->SetString("title", WideToUTF16Hack(
-        startup_custom_pages_table_model_->GetText(i, 0)));
+    entry->SetString("title", startup_custom_pages_table_model_->GetText(i, 0));
     entry->SetString("url", urls[i].spec());
-    entry->SetString("tooltip", WideToUTF16Hack(
-        startup_custom_pages_table_model_->GetTooltip(i)));
+    entry->SetString("tooltip",
+                     startup_custom_pages_table_model_->GetTooltip(i));
     startup_pages.Append(entry);
   }
 
   dom_ui_->CallJavascriptFunction(L"BrowserOptions.updateStartupPages",
                                   startup_pages);
 }
 
 void BrowserOptionsHandler::OnItemsChanged(int start, int length) {
   OnModelChanged();
 }
@@ skipping 56 matching lines @@
 }
 
 void BrowserOptionsHandler::SaveStartupPagesPref() {
   PrefService* prefs = dom_ui_->GetProfile()->GetPrefs();
 
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs);
   pref.urls = startup_custom_pages_table_model_->GetURLs();
 
   SessionStartupPref::SetStartupPref(prefs, pref);
 }