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, 13 insertions, 13 deletions

diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h
index 472a244..2c42449 100644
--- a/chrome/test/automation/automation_messages_internal.h
+++ b/chrome/test/automation/automation_messages_internal.h
@@ -214,18 +214,18 @@ IPC_BEGIN_MESSAGES(Automation)
   // This message asks the AutomationProvider whether a tab is waiting for
   // login info.
   IPC_SYNC_MESSAGE_ROUTED1_1(AutomationMsg_NeedsAuth,
-                             int, // tab handle
-                             bool) // status
+                             int,   // tab handle
+                             bool)  // status
 
   // This message requests the AutomationProvider to apply a certain
   // accelerator. It is completely asynchronous with the resulting accelerator
   // action.
   IPC_SYNC_MESSAGE_ROUTED2_0(AutomationMsg_ApplyAccelerator,
-                             int, // window handle
-                             int) // accelerator id like (IDC_BACK,
-                                  //  IDC_FORWARD, etc)
-                                  // The list can be found at
-                                  // chrome/app/chrome_dll_resource.h
+                             int,  // window handle
+                             int)  // accelerator id like (IDC_BACK,
+                                   //  IDC_FORWARD, etc)
+                                   // The list can be found at
+                                   // chrome/app/chrome_dll_resource.h
 
   // This message requests that the AutomationProvider executes a JavaScript,
   // which is sent embedded in a 'javascript:' URL.
@@ -843,13 +843,13 @@ IPC_BEGIN_MESSAGES(Automation)
   // web content tab.
   IPC_SYNC_MESSAGE_ROUTED1_1(AutomationMsg_GetPageCurrentEncoding,
                              int /* tab handle */,
-                             std::wstring /* current used encoding name */)
+                             std::string /* current used encoding name */)
 
   // Uses the specified encoding to override the encoding of the page in the
   // specified web content tab.
   IPC_SYNC_MESSAGE_ROUTED2_1(AutomationMsg_OverrideEncoding,
                              int /* tab handle */,
-                             std::wstring /* overrided encoding name */,
+                             std::string /* overrided encoding name */,
                              bool /* success */)
 
   // Used to disable the dialog box that prompts the user for a path when
diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc
index 6a1cb0a..85ab3fc 100644
--- a/chrome/test/automation/tab_proxy.cc
+++ b/chrome/test/automation/tab_proxy.cc
@@ -645,7 +645,7 @@ bool TabProxy::WaitForNavigation(int64 last_navigation_time) {
       result == AUTOMATION_MSG_NAVIGATION_AUTH_NEEDED;
 }
 
-bool TabProxy::GetPageCurrentEncoding(std::wstring* encoding) {
+bool TabProxy::GetPageCurrentEncoding(std::string* encoding) {
   if (!is_valid())
     return false;
 
@@ -654,7 +654,7 @@ bool TabProxy::GetPageCurrentEncoding(std::wstring* encoding) {
   return succeeded;
 }
 
-bool TabProxy::OverrideEncoding(const std::wstring& encoding) {
+bool TabProxy::OverrideEncoding(const std::string& encoding) {
   if (!is_valid())
     return false;
 
diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h
index c8bb83e..e8dbe49 100644
--- a/chrome/test/automation/tab_proxy.h
+++ b/chrome/test/automation/tab_proxy.h
@@ -304,10 +304,10 @@ class TabProxy : public AutomationResourceProxy {
   bool WaitForNavigation(int64 last_navigation_time);
 
   // Gets the current used encoding of the page in the tab.
-  bool GetPageCurrentEncoding(std::wstring* encoding);
+  bool GetPageCurrentEncoding(std::string* encoding);
 
   // Uses the specified encoding to override encoding of the page in the tab.
-  bool OverrideEncoding(const std::wstring& encoding);
+  bool OverrideEncoding(const std::string& encoding);
 
 #if defined(OS_WIN)
   // Resizes the tab window.