| Index: chrome/test/automation/tab_proxy.cc
|
| diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc
|
| index 6a1cb0a4d3cfa565cdbace2e793e9209b4a8c278..85ab3fcc65c0ceef1f997ca0fadcc59bee3a3813 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;
|
|
|
|
|