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

1 files changed, 5 insertions, 3 deletions

diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc
index cd2693a..1e05017 100644
--- a/chrome/browser/character_encoding.cc
+++ b/chrome/browser/character_encoding.cc
@@ -123,7 +123,8 @@ class CanonicalEncodingMap {
  private:
   scoped_ptr<IdToCanonicalEncodingNameMapType> id_to_encoding_name_map_;
   scoped_ptr<CanonicalEncodingNameToIdMapType> encoding_name_to_id_map_;
-  scoped_ptr<CanonicalNameDisplayNameMapType> encoding_name_to_display_name_map_;
+  scoped_ptr<CanonicalNameDisplayNameMapType>
+      encoding_name_to_display_name_map_;
   std::vector<int> locale_dependent_encoding_ids_;
   std::vector<CharacterEncoding::EncodingInfo> current_display_encodings_;
 
@@ -171,7 +172,8 @@ const CanonicalNameDisplayNameMapType*
     }
     // Then save in the overrides.
     for (int i = 0; i < canonical_display_name_overrides_length; ++i) {
-      (*encoding_name_to_display_name_map_)[canonical_display_name_overrides[i].canonical_form] =
+      (*encoding_name_to_display_name_map_)
+          [canonical_display_name_overrides[i].canonical_form] =
           canonical_display_name_overrides[i].display_form;
     }
     DCHECK(static_cast<int>(encoding_name_to_display_name_map_->size()) ==
@@ -499,7 +501,7 @@ const std::vector<CharacterEncoding::EncodingInfo>*
 }
 
 // Static
-bool CharacterEncoding::UpdateRecentlySelectdEncoding(
+bool CharacterEncoding::UpdateRecentlySelectedEncoding(
     const std::string& original_selected_encodings,
     int new_selected_encoding_id,
     std::string* selected_encodings) {