| Index: webkit/tools/test_shell/layout_test_controller.cc
|
| diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
|
| index 208a413ad597fd7f53dd455a9fe66683d3f92d04..6b00cde93b61948e3ef6d91e0ca3405056761456 100644
|
| --- a/webkit/tools/test_shell/layout_test_controller.cc
|
| +++ b/webkit/tools/test_shell/layout_test_controller.cc
|
| @@ -49,7 +49,6 @@
|
| #include "webkit/tools/test_shell/test_webview_delegate.h"
|
|
|
| using std::string;
|
| -using std::wstring;
|
|
|
| using WebKit::WebBindings;
|
| using WebKit::WebConsoleMessage;
|
| @@ -269,11 +268,12 @@ void LayoutTestController::PolicyDelegateDone() {
|
|
|
| void LayoutTestController::fallbackMethod(
|
| const CppArgumentList& args, CppVariant* result) {
|
| - std::wstring message(L"JavaScript ERROR: unknown method called on LayoutTestController");
|
| + std::string message(
|
| + "JavaScript ERROR: unknown method called on LayoutTestController");
|
| if (!shell_->layout_test_mode()) {
|
| logging::LogMessage("CONSOLE:", 0).stream() << message;
|
| } else {
|
| - printf("CONSOLE MESSAGE: %S\n", message.c_str());
|
| + printf("CONSOLE MESSAGE: %s\n", message.c_str());
|
| }
|
| result->SetNull();
|
| }
|
|
|