Index: content/shell/renderer/test_runner/web_test_proxy.cc |
diff --git a/content/shell/renderer/test_runner/web_test_proxy.cc b/content/shell/renderer/test_runner/web_test_proxy.cc |
index 18086de32ee8f1eb6b975bb02ad542c083b682a3..666337743491cfe07d6a0ba6b33ced2b3b895625 100644 |
--- a/content/shell/renderer/test_runner/web_test_proxy.cc |
+++ b/content/shell/renderer/test_runner/web_test_proxy.cc |
@@ -9,8 +9,10 @@ |
#include "base/callback_helpers.h" |
#include "base/command_line.h" |
#include "base/debug/trace_event.h" |
+#include "base/i18n/rtl.h" |
#include "base/logging.h" |
#include "base/strings/stringprintf.h" |
+#include "base/strings/utf_string_conversions.h" |
#include "content/public/common/content_switches.h" |
#include "content/shell/renderer/test_runner/TestPlugin.h" |
#include "content/shell/renderer/test_runner/WebTestDelegate.h" |
@@ -378,14 +380,13 @@ bool WebTestProxyBase::RunFileChooser( |
} |
void WebTestProxyBase::ShowValidationMessage( |
- const blink::WebRect& anchor_in_root_view, |
- const blink::WebString& message, |
- const blink::WebString& sub_message, |
- blink::WebTextDirection hint) { |
+ const base::string16& message, |
+ const base::string16& sub_message) { |
delegate_->printMessage( |
- std::string("ValidationMessageClient: main-message=") + |
- std::string(message.utf8()) + " sub-message=" + |
- std::string(sub_message.utf8()) + "\n"); |
+ "ValidationMessageClient: main-message=" + |
+ base::UTF16ToUTF8(message) + |
+ " sub-message=" + |
+ base::UTF16ToUTF8(sub_message) + "\n"); |
} |
std::string WebTestProxyBase::CaptureTree(bool debug_render_tree) { |