Extra parameter to pass sub-message direction for validation message

content/shell/renderer/test_runner/web_test_proxy.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/renderer/test_runner/web_test_proxy.h"
 
 #include <cctype>
 
 #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"
 #include "content/shell/renderer/test_runner/WebTestInterfaces.h"
 #include "content/shell/renderer/test_runner/accessibility_controller.h"
 #include "content/shell/renderer/test_runner/event_sender.h"
 #include "content/shell/renderer/test_runner/mock_color_chooser.h"
 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h"
 #include "content/shell/renderer/test_runner/mock_web_push_client.h"
 #include "content/shell/renderer/test_runner/mock_web_speech_recognizer.h"
@@ skipping 349 matching lines @@
     const blink::WebFileChooserParams& params,
     blink::WebFileChooserCompletion* completion) {
   delegate_->printMessage("Mock: Opening a file chooser.\n");
   // FIXME: Add ability to set file names to a file upload control.
   return false;
 }
 
 void WebTestProxyBase::ShowValidationMessage(
     const blink::WebRect& anchor_in_root_view,
     const blink::WebString& message,
+    blink::WebTextDirection message_dir,
     const blink::WebString& sub_message,
-    blink::WebTextDirection hint) {
+    blink::WebTextDirection sub_message_dir) {
+  base::string16 wrapped_main_text = message;
+  base::string16 wrapped_sub_text = sub_message;
+
+  if (message_dir == blink::WebTextDirectionLeftToRight) {

[jamesr, 2014/08/29 17:21:50]

this looks very repetitive. is there any way to share this logic with the
render_view_impl version?

+    wrapped_main_text =
+        base::i18n::GetDisplayStringInLTRDirectionality(wrapped_main_text);
+  } else if (message_dir == blink::WebTextDirectionRightToLeft) {
+    base::i18n::WrapStringWithRTLFormatting(&wrapped_main_text);
+  }
+
+  if (!wrapped_sub_text.empty()) {
+    if (sub_message_dir == blink::WebTextDirectionLeftToRight) {
+      wrapped_sub_text =
+          base::i18n::GetDisplayStringInLTRDirectionality(wrapped_sub_text);
+    } else if (sub_message_dir == blink::WebTextDirectionRightToLeft) {
+      base::i18n::WrapStringWithRTLFormatting(&wrapped_sub_text);
+    }
+  }
   delegate_->printMessage(
-      std::string("ValidationMessageClient: main-message=") +
-      std::string(message.utf8()) + " sub-message=" +
-      std::string(sub_message.utf8()) + "\n");
+      "ValidationMessageClient: main-message=" +
+      base::UTF16ToUTF8(wrapped_main_text) +
+      " sub-message=" +
+      base::UTF16ToUTF8(wrapped_sub_text) + "\n");
 }
 
 std::string WebTestProxyBase::CaptureTree(bool debug_render_tree) {
   bool should_dump_custom_text =
       test_interfaces_->GetTestRunner()->shouldDumpAsCustomText();
   bool should_dump_as_text =
       test_interfaces_->GetTestRunner()->shouldDumpAsText();
   bool should_dump_as_markup =
       test_interfaces_->GetTestRunner()->shouldDumpAsMarkup();
   bool should_dump_as_printed = test_interfaces_->GetTestRunner()->isPrinting();
@@ skipping 861 matching lines @@
   if (!push_client_.get())
     push_client_.reset(new MockWebPushClient);
   return push_client_.get();
 }
 
 blink::WebPushClient* WebTestProxyBase::GetWebPushClient() {
   return GetPushClientMock();
 }
 
 }  // namespace content