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

content/shell/renderer/layout_test/layout_test_render_frame_observer.cc

Index: content/shell/renderer/layout_test/layout_test_render_frame_observer.cc
diff --git a/content/shell/renderer/layout_test/layout_test_render_frame_observer.cc b/content/shell/renderer/layout_test/layout_test_render_frame_observer.cc
index a17c9fcad26736d67e19a3eec82b800e1b53e00f..806ec1ce78ba7033bbd588a88ed05f79305e3e70 100644
--- a/content/shell/renderer/layout_test/layout_test_render_frame_observer.cc
+++ b/content/shell/renderer/layout_test/layout_test_render_frame_observer.cc
@@ -6,8 +6,6 @@
 
 #include <string>
 
-#include "components/test_runner/layout_dump.h"
-#include "components/test_runner/layout_dump_flags.h"
 #include "components/test_runner/web_test_interfaces.h"
 #include "components/test_runner/web_test_runner.h"
 #include "content/public/renderer/render_frame.h"
@@ -47,13 +45,11 @@ bool LayoutTestRenderFrameObserver::OnMessageReceived(
 }
 
 void LayoutTestRenderFrameObserver::OnLayoutDumpRequest() {
-  const test_runner::LayoutDumpFlags& layout_dump_flags =
+  std::string dump =
       LayoutTestRenderProcessObserver::GetInstance()
           ->test_interfaces()
           ->TestRunner()
-          ->GetLayoutDumpFlags();
-  std::string dump =
-      test_runner::DumpLayout(render_frame()->GetWebFrame(), layout_dump_flags);
+          ->DumpLayout(render_frame()->GetWebFrame());
   Send(new ShellViewHostMsg_LayoutDumpResponse(routing_id(), dump));
 }