Convert std::wstring encoding names to std::string in a bunch of files.

BUG=8647 (http://crbug.com/8647)
TEST=run unit_tests.exe and ui_tests.exe

Original patch by Thiago Farina <thiago.farina@gmail.com> at
http://codereview.chromium.org/179057/show

Some linux related fixes by me.

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


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

3 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 95a53dd..ba82b80 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -440,7 +440,7 @@ void RenderViewHost::Zoom(PageZoom::Function function) {
   Send(new ViewMsg_Zoom(routing_id(), function));
 }
 
-void RenderViewHost::SetPageEncoding(const std::wstring& encoding_name) {
+void RenderViewHost::SetPageEncoding(const std::string& encoding_name) {
   Send(new ViewMsg_SetPageEncoding(routing_id(), encoding_name));
 }
 
@@ -975,7 +975,7 @@ void RenderViewHost::OnMsgUpdateTitle(int32 page_id,
   delegate_->UpdateTitle(this, page_id, title);
 }
 
-void RenderViewHost::OnMsgUpdateEncoding(const std::wstring& encoding_name) {
+void RenderViewHost::OnMsgUpdateEncoding(const std::string& encoding_name) {
   delegate_->UpdateEncoding(this, encoding_name);
 }
 
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index 0fe33e8..f733f7b 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -221,7 +221,7 @@ class RenderViewHost : public RenderWidgetHost,
   void Zoom(PageZoom::Function function);
 
   // Change the encoding of the page.
-  void SetPageEncoding(const std::wstring& encoding);
+  void SetPageEncoding(const std::string& encoding);
 
   // Change the alternate error page URL.  An empty GURL disables the use of
   // alternate error pages.
@@ -458,7 +458,7 @@ class RenderViewHost : public RenderWidgetHost,
   void OnMsgUpdateState(int32 page_id,
                         const std::string& state);
   void OnMsgUpdateTitle(int32 page_id, const std::wstring& title);
-  void OnMsgUpdateEncoding(const std::wstring& encoding);
+  void OnMsgUpdateEncoding(const std::string& encoding);
   void OnMsgUpdateTargetURL(int32 page_id, const GURL& url);
   void OnMsgThumbnail(const GURL& url,
                       const ThumbnailScore& score,
diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h
index 2727879..6e62289 100644
--- a/chrome/browser/renderer_host/render_view_host_delegate.h
+++ b/chrome/browser/renderer_host/render_view_host_delegate.h
@@ -415,7 +415,7 @@ class RenderViewHostDelegate {
 
   // The page's encoding was changed and should be updated.
   virtual void UpdateEncoding(RenderViewHost* render_view_host,
-                              const std::wstring& encoding) {}
+                              const std::string& encoding) {}
 
   // The destination URL has changed should be updated
   virtual void UpdateTargetURL(int32 page_id, const GURL& url) {}