Change a bunch of string types.

Started out just trying to change PrefService::GetString and ::SetString. This snowballed a little bit. Had to change a bunch of url strings in search_engines/ from wstring to string (some of them may be better off as GURLs, but UTF-8 is a step in the right direction, since that's what GURL uses internally, as well as externally via its setters/getters).

TODO (later patch): things that ask for accepted languages should use std::string, not std::wstring.

BUG=none
TEST=try bots

Review URL: http://codereview.chromium.org/2854015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51157 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 43 insertions, 46 deletions

diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 8c7deeb..c6caa97 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -115,9 +115,6 @@ static const int kSeparatorStartX = 2;
 // Left-padding for the instructional text.
 static const int kInstructionsPadding = 6;
 
-// Color of the instructional text.
-static const SkColor kInstructionsColor = SkColorSetRGB(128, 128, 142);
-
 // Tag for the 'Other bookmarks' button.
 static const int kOtherFolderButtonTag = 1;
 
@@ -193,7 +190,7 @@ class BookmarkButton : public views::TextButton {
     gfx::Point location(p);
     ConvertPointToScreen(this, &location);
     *tooltip = CreateToolTipForURLAndTitle(location, url_, text(),
-        profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
+        UTF8ToWide(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)));
     return !tooltip->empty();
   }
 
diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc
index 6fc5c55..3579c8c 100644
--- a/chrome/browser/views/bookmark_editor_view.cc
+++ b/chrome/browser/views/bookmark_editor_view.cc
@@ -277,7 +277,7 @@ void BookmarkEditorView::Init() {
   std::wstring url_text;
   if (details_.type == EditDetails::EXISTING_NODE) {
     std::wstring languages = profile_
-        ? profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)
+        ? UTF8ToWide(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages))
         : std::wstring();
     // Because this gets parsed by FixupURL(), it's safe to omit the scheme or
     // trailing slash, and unescape most characters, but we need to not drop any
diff --git a/chrome/browser/views/edit_search_engine_dialog.cc b/chrome/browser/views/edit_search_engine_dialog.cc
index c32eaba..78dfcee 100644
--- a/chrome/browser/views/edit_search_engine_dialog.cc
+++ b/chrome/browser/views/edit_search_engine_dialog.cc
@@ -8,6 +8,7 @@
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/edit_search_engine_controller.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "googleurl/src/gurl.h"
@@ -86,7 +87,7 @@ bool EditSearchEngineDialog::IsDialogButtonEnabled(
   if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
     return (controller_->IsKeywordValid(keyword_tf_->text()) &&
             controller_->IsTitleValid(title_tf_->text()) &&
-            controller_->IsURLValid(url_tf_->text()));
+            controller_->IsURLValid(WideToUTF8(url_tf_->text())));
   }
   return true;
 }
@@ -98,7 +99,7 @@ bool EditSearchEngineDialog::Cancel() {
 
 bool EditSearchEngineDialog::Accept() {
   controller_->AcceptAddOrEdit(title_tf_->text(), keyword_tf_->text(),
-                               url_tf_->text());
+                               WideToUTF8(url_tf_->text()));
   return true;
 }
 
@@ -239,7 +240,7 @@ Textfield* EditSearchEngineDialog::CreateTextfield(const std::wstring& text,
 void EditSearchEngineDialog::UpdateImageViews() {
   UpdateImageView(keyword_iv_, controller_->IsKeywordValid(keyword_tf_->text()),
                   IDS_SEARCH_ENGINES_INVALID_KEYWORD_TT);
-  UpdateImageView(url_iv_, controller_->IsURLValid(url_tf_->text()),
+  UpdateImageView(url_iv_, controller_->IsURLValid(WideToUTF8(url_tf_->text())),
                   IDS_SEARCH_ENGINES_INVALID_URL_TT);
   UpdateImageView(title_iv_, controller_->IsTitleValid(title_tf_->text()),
                   IDS_SEARCH_ENGINES_INVALID_TITLE_TT);
diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc
index ca0ff9e..666c7d8 100644
--- a/chrome/browser/views/keyword_editor_view.cc
+++ b/chrome/browser/views/keyword_editor_view.cc
@@ -102,7 +102,7 @@ KeywordEditorView::~KeywordEditorView() {
 void KeywordEditorView::OnEditedKeyword(const TemplateURL* template_url,
                                         const std::wstring& title,
                                         const std::wstring& keyword,
-                                        const std::wstring& url) {
+                                        const std::string& url) {
   if (template_url) {
     controller_->ModifyTemplateURL(template_url, title, keyword, url);
 
diff --git a/chrome/browser/views/keyword_editor_view.h b/chrome/browser/views/keyword_editor_view.h
index 1b925cb3..34cd39b 100644
--- a/chrome/browser/views/keyword_editor_view.h
+++ b/chrome/browser/views/keyword_editor_view.h
@@ -59,7 +59,7 @@ class KeywordEditorView : public views::View,
   virtual void OnEditedKeyword(const TemplateURL* template_url,
                                const std::wstring& title,
                                const std::wstring& keyword,
-                               const std::wstring& url);
+                               const std::string& url);
 
   // Overridden to invoke Layout.
   virtual gfx::Size GetPreferredSize();
diff --git a/chrome/browser/views/options/exceptions_page_view.cc b/chrome/browser/views/options/exceptions_page_view.cc
index 6001cc8..762c58d 100644
--- a/chrome/browser/views/options/exceptions_page_view.cc
+++ b/chrome/browser/views/options/exceptions_page_view.cc
@@ -6,6 +6,7 @@
 
 #include "app/l10n_util.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
@@ -51,7 +52,7 @@ void ExceptionsTableModel::OnPasswordStoreRequestDone(
 
   STLDeleteElements<PasswordRows>(&saved_signons_);
   std::wstring languages =
-      profile_->GetPrefs()->GetString(prefs::kAcceptLanguages);
+      UTF8ToWide(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
   for (size_t i = 0; i < result.size(); ++i) {
     saved_signons_.push_back(new PasswordRow(
         gfx::SortedDisplayURL(result[i]->origin, languages), result[i]));
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index df5b832..d120354 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -240,16 +240,18 @@ void FontsPageView::FontSelected(const gfx::Font& const_font, void* params) {
 void FontsPageView::SaveChanges() {
   // Set Fonts.
   if (font_changed_) {
-    serif_name_.SetValue(serif_font_display_view_->font_name());
+    serif_name_.SetValue(WideToUTF8(serif_font_display_view_->font_name()));
     serif_size_.SetValue(serif_font_size_pixel_);
-    sans_serif_name_.SetValue(sans_serif_font_display_view_->font_name());
+    sans_serif_name_.SetValue(
+        WideToUTF8(sans_serif_font_display_view_->font_name()));
     sans_serif_size_.SetValue(sans_serif_font_size_pixel_);
-    fixed_width_name_.SetValue(fixed_width_font_display_view_->font_name());
+    fixed_width_name_.SetValue(WideToUTF8(
+        fixed_width_font_display_view_->font_name()));
     fixed_width_size_.SetValue(fixed_width_font_size_pixel_);
   }
   // Set Encoding.
   if (default_encoding_changed_)
-    default_encoding_.SetValue(ASCIIToWide(default_encoding_selected_));
+    default_encoding_.SetValue(default_encoding_selected_);
 }
 
 void FontsPageView::InitControlLayout() {
@@ -296,19 +298,19 @@ void FontsPageView::NotifyPrefChanged(const std::wstring* pref_name) {
   if (!pref_name || *pref_name == prefs::kWebKitFixedFontFamily) {
     fixed_width_font_size_pixel_ = fixed_width_size_.GetValue();
     fixed_width_font_display_view_->SetFontType(
-        fixed_width_name_.GetValue(),
+        UTF8ToWide(fixed_width_name_.GetValue()),
         fixed_width_font_size_pixel_);
   }
   if (!pref_name || *pref_name == prefs::kWebKitSerifFontFamily) {
     serif_font_size_pixel_ = serif_size_.GetValue();
     serif_font_display_view_->SetFontType(
-        serif_name_.GetValue(),
+        UTF8ToWide(serif_name_.GetValue()),
         serif_font_size_pixel_);
   }
   if (!pref_name || *pref_name == prefs::kWebKitSansSerifFontFamily) {
     sans_serif_font_size_pixel_ = sans_serif_size_.GetValue();
     sans_serif_font_display_view_->SetFontType(
-        sans_serif_name_.GetValue(),
+        UTF8ToWide(sans_serif_name_.GetValue()),
         sans_serif_font_size_pixel_);
   }
 }
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc
index 26878eb..20504c9 100644
--- a/chrome/browser/views/options/general_page_view.cc
+++ b/chrome/browser/views/options/general_page_view.cc
@@ -35,15 +35,12 @@
 
 namespace {
 
-static const int kStartupRadioGroup = 1;
-static const int kHomePageRadioGroup = 2;
-static const SkColor kDefaultBrowserLabelColor = SkColorSetRGB(0, 135, 0);
-static const SkColor kNotDefaultBrowserLabelColor = SkColorSetRGB(135, 0, 0);
+const int kStartupRadioGroup = 1;
+const int kHomePageRadioGroup = 2;
+const SkColor kDefaultBrowserLabelColor = SkColorSetRGB(0, 135, 0);
+const SkColor kNotDefaultBrowserLabelColor = SkColorSetRGB(135, 0, 0);
 
-std::wstring GetNewTabUIURLString() {
-  return UTF8ToWide(chrome::kChromeUINewTabURL);
-}
-}
+}  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // SearchEngineListModel
@@ -380,7 +377,7 @@ void GeneralPageView::NotifyPrefChanged(const std::wstring* pref_name) {
       *pref_name == prefs::kHomePage) {
     bool managed =
         new_tab_page_is_home_page_.IsManaged() || homepage_.IsManaged();
-    bool homepage_valid = homepage_.GetValue() != GetNewTabUIURLString();
+    bool homepage_valid = homepage_.GetValue() != chrome::kChromeUINewTabURL;
     bool use_new_tab_page_for_homepage =
         new_tab_page_is_home_page_.GetValue() || !homepage_valid;
     homepage_use_newtab_radio_->SetChecked(use_new_tab_page_for_homepage);
@@ -389,7 +386,7 @@ void GeneralPageView::NotifyPrefChanged(const std::wstring* pref_name) {
     homepage_use_url_radio_->SetEnabled(!managed);
 
     if (homepage_valid)
-      homepage_use_url_textfield_->SetText(homepage_.GetValue());
+      homepage_use_url_textfield_->SetText(UTF8ToWide(homepage_.GetValue()));
     EnableHomepageURLField(!managed && !use_new_tab_page_for_homepage);
   }
 
@@ -750,13 +747,12 @@ void GeneralPageView::UpdateHomepagePrefs() {
     URLFixerUpper::FixupURL(
        UTF16ToUTF8(homepage_use_url_textfield_->text()), std::string());
   bool new_tab_page_is_home_page = homepage_use_newtab_radio_->checked();
-  if (!homepage.is_valid() ||
-      UTF8ToWide(homepage.spec()) == GetNewTabUIURLString()) {
+  if (!homepage.is_valid() || homepage.spec() == chrome::kChromeUINewTabURL) {
     new_tab_page_is_home_page = true;
     if (!homepage.has_host())
-      homepage_.SetValue(std::wstring());
+      homepage_.SetValue(std::string());
   } else {
-    homepage_.SetValue(UTF8ToWide(homepage.spec()));
+    homepage_.SetValue(homepage.spec());
   }
   new_tab_page_is_home_page_.SetValue(new_tab_page_is_home_page);
 }
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index 4f7991b..0a2bc589 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -401,7 +401,7 @@ void LanguagesPageView::InitControlLayout() {
 void LanguagesPageView::NotifyPrefChanged(const std::wstring* pref_name) {
   if (!pref_name || *pref_name == prefs::kAcceptLanguages) {
     language_order_table_model_->SetAcceptLanguagesString(
-        WideToASCII(accept_languages_.GetValue()));
+        accept_languages_.GetValue());
   }
   if (!pref_name || *pref_name == prefs::kApplicationLocale) {
     int index = ui_language_model_->GetSelectedLanguageIndex(
@@ -431,10 +431,9 @@ void LanguagesPageView::NotifyPrefChanged(const std::wstring* pref_name) {
     // dictionary language in the user profile now correctly stores "fr"
     // instead of "fr-FR".
     if (index < 0) {
-      const std::string& lang_region = WideToASCII(
-          dictionary_language_.GetValue());
-      dictionary_language_.SetValue(ASCIIToWide(
-          SpellCheckCommon::GetLanguageFromLanguageRegion(lang_region)));
+      const std::string& lang_region = dictionary_language_.GetValue();
+      dictionary_language_.SetValue(
+          SpellCheckCommon::GetLanguageFromLanguageRegion(lang_region));
       index = dictionary_language_model_->GetSelectedLanguageIndex(
           prefs::kSpellCheckDictionary);
     }
@@ -547,15 +546,15 @@ void LanguagesPageView::OnMoveUpLanguage() {
 
 void LanguagesPageView::SaveChanges() {
   if (language_order_table_model_.get() && language_table_edited_) {
-    accept_languages_.SetValue(ASCIIToWide(
-        language_order_table_model_->GetLanguageList()));
+    accept_languages_.SetValue(
+        language_order_table_model_->GetLanguageList());
   }
 
   if (ui_language_index_selected_ != -1) {
     UserMetricsRecordAction(UserMetricsAction("Options_AppLanguage"),
                             g_browser_process->local_state());
-    app_locale_.SetValue(ASCIIToWide(ui_language_model_->
-        GetLocaleFromIndex(ui_language_index_selected_)));
+    app_locale_.SetValue(ui_language_model_->
+        GetLocaleFromIndex(ui_language_index_selected_));
 
     // Remove pref values for spellcheck dictionaries forcefully.
     PrefService* prefs = profile()->GetPrefs();
@@ -566,8 +565,8 @@ void LanguagesPageView::SaveChanges() {
   if (spellcheck_language_index_selected_ != -1) {
     UserMetricsRecordAction(UserMetricsAction("Options_DictionaryLanguage"),
                             profile()->GetPrefs());
-    dictionary_language_.SetValue(ASCIIToWide(dictionary_language_model_->
-        GetLocaleFromIndex(spellcheck_language_index_selected_)));
+    dictionary_language_.SetValue(dictionary_language_model_->
+        GetLocaleFromIndex(spellcheck_language_index_selected_));
   }
 
   if (enable_spellcheck_checkbox_clicked_)
diff --git a/chrome/browser/views/options/passwords_page_view.cc b/chrome/browser/views/options/passwords_page_view.cc
index eed3fe1..a339683 100644
--- a/chrome/browser/views/options/passwords_page_view.cc
+++ b/chrome/browser/views/options/passwords_page_view.cc
@@ -7,6 +7,7 @@
 #include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
@@ -112,7 +113,7 @@ void PasswordsTableModel::OnPasswordStoreRequestDone(
   STLDeleteElements<PasswordRows>(&saved_signons_);
   saved_signons_.resize(result.size(), NULL);
   std::wstring languages =
-      profile_->GetPrefs()->GetString(prefs::kAcceptLanguages);
+      UTF8ToWide(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
   for (size_t i = 0; i < result.size(); ++i) {
     saved_signons_[i] = new PasswordRow(
         gfx::SortedDisplayURL(result[i]->origin, languages), result[i]);
diff --git a/chrome/browser/views/url_picker.cc b/chrome/browser/views/url_picker.cc
index fa5418b..aa749e8 100644
--- a/chrome/browser/views/url_picker.cc
+++ b/chrome/browser/views/url_picker.cc
@@ -219,8 +219,8 @@ bool UrlPicker::AcceleratorPressed(
 void UrlPicker::OnSelectionChanged() {
   int selection = url_table_->FirstSelectedRow();
   if (selection >= 0 && selection < url_table_model_->RowCount()) {
-    std::wstring languages =
-        profile_->GetPrefs()->GetString(prefs::kAcceptLanguages);
+    std::wstring languages = UTF8ToWide(
+        profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
     // Because this gets parsed by FixupURL(), it's safe to omit the scheme or
     // trailing slash, and unescape most characters, but we need to not drop any
     // username/password, or unescape anything that changes the meaning.