| Index: chrome/test/webdriver/automation.cc
|
| ===================================================================
|
| --- chrome/test/webdriver/automation.cc (revision 73805)
|
| +++ chrome/test/webdriver/automation.cc (working copy)
|
| @@ -50,13 +50,13 @@
|
| const std::string& script,
|
| std::string* result,
|
| bool* success) {
|
| - std::wstring wide_xpath = UTF8ToWide(frame_xpath);
|
| - std::wstring wide_script = UTF8ToWide(script);
|
| - std::wstring wide_result;
|
| + string16 xpath16 = UTF8ToUTF16(frame_xpath);
|
| + string16 script16 = UTF8ToUTF16(script);
|
| + string16 result16;
|
| *success = tab_->ExecuteAndExtractString(
|
| - wide_xpath, wide_script, &wide_result);
|
| + xpath16, script16, &result16);
|
| if (*success)
|
| - *result = WideToUTF8(wide_result);
|
| + *result = UTF16ToUTF8(result16);
|
| }
|
|
|
| void Automation::NavigateToURL(const std::string& url,
|
| @@ -86,10 +86,10 @@
|
|
|
| void Automation::GetTabTitle(std::string* tab_title,
|
| bool* success) {
|
| - std::wstring wide_title;
|
| - *success = tab_->GetTabTitle(&wide_title);
|
| + string16 title16;
|
| + *success = tab_->GetTabTitle(&title16);
|
| if (*success)
|
| - *tab_title = WideToUTF8(wide_title);
|
| + *tab_title = UTF16ToUTF8(title16);
|
| }
|
|
|
| } // namespace webdriver
|
|
|