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

2 files changed, 11 insertions, 11 deletions

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 324d95b..339c092 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -1001,7 +1001,7 @@ void RenderView::UpdateTitle(WebFrame* frame, const std::wstring& title) {
 }
 
 void RenderView::UpdateEncoding(WebFrame* frame,
-                                const std::wstring& encoding_name) {
+                                const std::string& encoding_name) {
   // Only update main frame's encoding_name.
   if (webview()->GetMainFrame() == frame &&
       last_encoding_name_ != encoding_name) {
@@ -2575,7 +2575,7 @@ void RenderView::OnInsertText(const string16& text) {
   frame->insertText(text);
 }
 
-void RenderView::OnSetPageEncoding(const std::wstring& encoding_name) {
+void RenderView::OnSetPageEncoding(const std::string& encoding_name) {
   webview()->SetPageEncoding(encoding_name);
 }
 
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index c076bc6..aa6bc74 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_RENDERER_RENDER_VIEW_H_
 #define CHROME_RENDERER_RENDER_VIEW_H_
 
+#include <set>
 #include <string>
 #include <queue>
 #include <vector>
@@ -217,17 +218,15 @@ class RenderView : public RenderWidget,
   virtual void DidFailLoadWithError(WebView* webview,
                                     const WebKit::WebURLError& error,
                                     WebKit::WebFrame* forFrame);
-  virtual void DidFinishDocumentLoadForFrame(
-      WebView* webview,
-      WebKit::WebFrame* frame);
+  virtual void DidFinishDocumentLoadForFrame(WebView* webview,
+                                             WebKit::WebFrame* frame);
   virtual bool DidLoadResourceFromMemoryCache(
       WebView* webview,
       const WebKit::WebURLRequest& request,
       const WebKit::WebURLResponse& response,
       WebKit::WebFrame* frame);
-  virtual void DidHandleOnloadEventsForFrame(
-      WebView* webview,
-      WebKit::WebFrame* frame);
+  virtual void DidHandleOnloadEventsForFrame(WebView* webview,
+                                             WebKit::WebFrame* frame);
   virtual void DidChangeLocationWithinPageForFrame(WebView* webview,
                                                    WebKit::WebFrame* frame,
                                                    bool is_new_navigation);
@@ -476,7 +475,8 @@ class RenderView : public RenderWidget,
   // c) function:DidFinishDocumentLoadForFrame. When this function is
   // called, that means we have got whole html page. In here we should
   // finally get right encoding of page.
-  void UpdateEncoding(WebKit::WebFrame* frame, const std::wstring& encoding_name);
+  void UpdateEncoding(WebKit::WebFrame* frame,
+                      const std::string& encoding_name);
 
   // Captures the thumbnail and text contents for indexing for the given load
   // ID. If the view's load ID is different than the parameter, this call is
@@ -540,7 +540,7 @@ class RenderView : public RenderWidget,
   void OnDeterminePageText();
   void OnZoom(int function);
   void OnInsertText(const string16& text);
-  void OnSetPageEncoding(const std::wstring& encoding_name);
+  void OnSetPageEncoding(const std::string& encoding_name);
   void OnGetAllSavableResourceLinksForCurrentPage(const GURL& page_url);
   void OnGetSerializedHtmlDataForCurrentPageWithLocalLinks(
       const std::vector<GURL>& links,
@@ -712,7 +712,7 @@ class RenderView : public RenderWidget,
   ExternalHostBindings external_host_bindings_;
 
   // The last gotten main frame's encoding.
-  std::wstring last_encoding_name_;
+  std::string last_encoding_name_;
 
   // The URL we think the user's mouse is hovering over. We use this to
   // determine if we want to send a new one (we do not need to send