Index: chrome/test/ui/dom_checker_uitest.cc |
=================================================================== |
--- chrome/test/ui/dom_checker_uitest.cc (revision 73855) |
+++ chrome/test/ui/dom_checker_uitest.cc (working copy) |
@@ -149,17 +149,18 @@ |
} |
bool GetTestCount(TabProxy* tab, int* test_count) { |
- return tab->ExecuteAndExtractInt(L"", |
- L"window.domAutomationController.send(automation.GetTestCount());", |
+ return tab->ExecuteAndExtractInt(string16(), |
+ ASCIIToUTF16("window.domAutomationController.send(" |
+ "automation.GetTestCount());"), |
test_count); |
} |
bool GetTestsFailed(TabProxy* tab, ResultsSet* tests_failed) { |
- std::wstring json_wide; |
- bool succeeded = tab->ExecuteAndExtractString(L"", |
- L"window.domAutomationController.send(" |
- L" JSON.stringify(automation.GetFailures()));", |
- &json_wide); |
+ string16 json16; |
+ bool succeeded = tab->ExecuteAndExtractString(string16(), |
+ ASCIIToUTF16("window.domAutomationController.send(" |
+ "JSON.stringify(automation.GetFailures()));"), |
+ &json16); |
// Note that we don't use ASSERT_TRUE here (and in some other places) as it |
// doesn't work inside a function with a return type other than void. |
@@ -167,7 +168,7 @@ |
if (!succeeded) |
return false; |
- std::string json = WideToUTF8(json_wide); |
+ std::string json = UTF16ToUTF8(json16); |
JSONStringValueSerializer deserializer(json); |
scoped_ptr<Value> value(deserializer.Deserialize(NULL, NULL)); |