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

components/test_runner/web_test_runner.h

Index: components/test_runner/web_test_runner.h
diff --git a/components/test_runner/web_test_runner.h b/components/test_runner/web_test_runner.h
index 981bdba2167282dce82f3ba6a539a653d5222197..9b808ab6d000824a1cdbb68dd2923a8101da648b 100644
--- a/components/test_runner/web_test_runner.h
+++ b/components/test_runner/web_test_runner.h
@@ -14,12 +14,11 @@ class DictionaryValue;
 
 namespace blink {
 class WebContentSettingsClient;
+class WebLocalFrame;
 }
 
 namespace test_runner {
 
-class LayoutDumpFlags;
-
 class WebTestRunner {
  public:
   // Returns a mock WebContentSettings that is used for layout tests. An
@@ -35,11 +34,16 @@ class WebTestRunner {
   virtual bool ShouldDumpAsAudio() const = 0;
   virtual void GetAudioData(std::vector<unsigned char>* buffer_view) const = 0;
 
-  // Gets layout dump flags (i.e. dump-as-text or dump-as-markup) requested
-  // by the test (i.e. via testRunner.dumpAsText() called from javascript).
-  virtual const LayoutDumpFlags& GetLayoutDumpFlags() = 0;
+  // Reports if tests requested a recursive layout dump of all frames
+  // (i.e. by calling testRunner.dumpChildFramesAsText() from javascript).
+  virtual bool IsRecursiveLayoutDumpRequested() = 0;
+
+  // Dumps layout of |frame| using the mode requested by the current test
+  // (i.e. text mode if testRunner.dumpAsText() was called from javascript).
+  virtual std::string DumpLayout(blink::WebLocalFrame* frame) = 0;
 
-  // Replicates changes to layout dump flags.
+  // Replicates changes to layout dump flags (i.e. changes that happened in
+  // another renderer). See also WebTestDelegate::OnLayoutDumpFlagsChanged.
   virtual void ReplicateLayoutDumpFlagsChanges(
       const base::DictionaryValue& changed_values) = 0;