Make test_runner::LayoutDumpFlags an internal detail of components/test_runner.

content/shell/renderer/layout_test/blink_test_runner.cc

 // Copyright (c) 2012 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/layout_test/blink_test_runner.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <clocale>
 #include <cmath>
@@ skipping 12 matching lines @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "components/plugins/renderer/plugin_placeholder.h"
 #include "components/test_runner/gamepad_controller.h"
-#include "components/test_runner/layout_dump.h"
-#include "components/test_runner/layout_dump_flags.h"
 #include "components/test_runner/test_interfaces.h"
 #include "components/test_runner/web_task.h"
 #include "components/test_runner/web_test_interfaces.h"
 #include "components/test_runner/web_test_proxy.h"
 #include "components/test_runner/web_test_runner.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/web_preferences.h"
 #include "content/public/renderer/media_stream_api.h"
 #include "content/public/renderer/render_frame.h"
@@ skipping 833 matching lines @@
     return;
   }
 
   std::string custom_text_dump;
   if (interfaces->TestRunner()->HasCustomTextDump(&custom_text_dump)) {
     Send(new ShellViewHostMsg_TextDump(routing_id(), custom_text_dump + "\n"));
     CaptureDumpContinued();
     return;
   }
 
-  const test_runner::LayoutDumpFlags& layout_dump_flags =
-      interfaces->TestRunner()->GetLayoutDumpFlags();
-  if (!layout_dump_flags.dump_child_frames()) {
-    std::string layout_dump = DumpLayout(
-        render_view()->GetMainRenderFrame()->GetWebFrame(), layout_dump_flags);
+  if (!interfaces->TestRunner()->IsRecursiveLayoutDumpRequested()) {
+    std::string layout_dump = interfaces->TestRunner()->DumpLayout(
+        render_view()->GetMainRenderFrame()->GetWebFrame());
     OnLayoutDumpCompleted(layout_dump);
     return;
   }
 
   Send(new ShellViewHostMsg_InitiateLayoutDump(routing_id()));
   // OnLayoutDumpCompleted will be eventually called by an IPC from the browser.
 }
 
 void BlinkTestRunner::OnLayoutDumpCompleted(std::string completed_layout_dump) {
   test_runner::WebTestInterfaces* interfaces =
@@ skipping 127 matching lines @@
   get_bluetooth_events_callbacks_.pop_front();
   callback.Run(events);
 }
 
 void BlinkTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 }  // namespace content