Add --dump-line-box-trees parameter to content_shell.

components/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 "components/test_runner/web_test_proxy.h"
 
 #include <cctype>
 
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
@@ skipping 438 matching lines @@
 }
 
 void WebTestProxyBase::ShowValidationMessage(
     const base::string16& message,
     const base::string16& sub_message) {
   delegate_->PrintMessage("ValidationMessageClient: main-message=" +
                           base::UTF16ToUTF8(message) + " sub-message=" +
                           base::UTF16ToUTF8(sub_message) + "\n");
 }
 
-std::string WebTestProxyBase::CaptureTree(bool debug_render_tree) {
+std::string WebTestProxyBase::CaptureTree(
+    bool debug_render_tree,
+    bool dump_line_box_trees) {
   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();
   blink::WebFrame* frame = GetWebView()->mainFrame();
   std::string data_utf8;
   if (should_dump_custom_text) {
@@ skipping 12 matching lines @@
     data_utf8 = DumpFramesAsMarkup(frame, recursive);
   } else {
     bool recursive = test_interfaces_->GetTestRunner()
                          ->shouldDumpChildFrameScrollPositions();
     blink::WebFrame::LayoutAsTextControls layout_text_behavior =
         blink::WebFrame::LayoutAsTextNormal;
     if (should_dump_as_printed)
       layout_text_behavior |= blink::WebFrame::LayoutAsTextPrinting;
     if (debug_render_tree)
       layout_text_behavior |= blink::WebFrame::LayoutAsTextDebug;
+    if (dump_line_box_trees)
+      layout_text_behavior |= blink::WebFrame::LayoutAsTextWithLineTrees;
     data_utf8 = frame->layoutTreeAsText(layout_text_behavior).utf8();
     data_utf8 += DumpFrameScrollPosition(frame, recursive);
   }
 
   if (test_interfaces_->GetTestRunner()->ShouldDumpBackForwardList())
     data_utf8 += DumpAllBackForwardLists(test_interfaces_, delegate_);
 
   return data_utf8;
 }
 
@@ skipping 895 matching lines @@
   // to cancel the input method's ongoing composition session.
   if (web_widget_)
     web_widget_->confirmComposition();
 }
 
 blink::WebString WebTestProxyBase::acceptLanguages() {
   return blink::WebString::fromUTF8(accept_languages_);
 }
 
 }  // namespace test_runner