Extra parameter to pass sub-message direction for validation message

content/shell/renderer/test_runner/web_test_proxy.h

 // 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.
 
 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
 
 #include <deque>
 #include <map>
 #include <string>
@@ skipping 89 matching lines @@
 
   void Reset();
 
   blink::WebSpellCheckClient* GetSpellCheckClient() const;
   blink::WebColorChooser* CreateColorChooser(
       blink::WebColorChooserClient* client,
       const blink::WebColor& color,
       const blink::WebVector<blink::WebColorSuggestion>& suggestions);
   bool RunFileChooser(const blink::WebFileChooserParams& params,
                       blink::WebFileChooserCompletion* completion);
-  void ShowValidationMessage(const blink::WebRect& anchor_in_root_view,
-                             const blink::WebString& message,
-                             const blink::WebString& sub_message,
-                             blink::WebTextDirection hint);
+  void ShowValidationMessage(const base::string16& message,
+                             const base::string16& sub_message);
   void HideValidationMessage();
   void MoveValidationMessage(const blink::WebRect& anchor_in_root_view);
 
   std::string CaptureTree(bool debug_render_tree);
   void CapturePixelsForPrinting(
       const base::Callback<void(const SkBitmap&)>& callback);
   void CopyImageAtAndCapturePixels(
       int x, int y, const base::Callback<void(const SkBitmap&)>& callback);
   void CapturePixelsAsync(
       const base::Callback<void(const SkBitmap&)>& callback);
@@ skipping 246 matching lines @@
                               blink::WebTextDirection hint) {
     WebTestProxyBase::SetToolTipText(text, hint);
     Base::setToolTipText(text, hint);
   }
   virtual void resetInputMethod() { WebTestProxyBase::ResetInputMethod(); }
   virtual bool runFileChooser(const blink::WebFileChooserParams& params,
                               blink::WebFileChooserCompletion* completion) {
     return WebTestProxyBase::RunFileChooser(params, completion);
   }
   virtual void showValidationMessage(const blink::WebRect& anchor_in_root_view,
-                                     const blink::WebString& message,
+                                     const blink::WebString& main_message,
+                                     blink::WebTextDirection main_message_hint,
                                      const blink::WebString& sub_message,
-                                     blink::WebTextDirection hint) {
+                                     blink::WebTextDirection sub_message_hint) {
+    base::string16 wrapped_main_text = main_message;
+    base::string16 wrapped_sub_text = sub_message;
+
+    Base::SetValidationMessageDirection(
+        &wrapped_main_text, main_message_hint, &wrapped_sub_text, sub_message_hint);
+
     WebTestProxyBase::ShowValidationMessage(
-        anchor_in_root_view, message, sub_message, hint);
+        wrapped_main_text, wrapped_sub_text);
   }
   virtual void postSpellCheckEvent(const blink::WebString& event_name) {
     WebTestProxyBase::PostSpellCheckEvent(event_name);
   }
   virtual blink::WebString acceptLanguages() {
     return WebTestProxyBase::acceptLanguages();
   }
   virtual blink::WebPushClient* webPushClient() {
     return WebTestProxyBase::GetWebPushClient();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_