Remove duplication between TestRunner's fields and LayoutDumpFlags struct.

components/test_runner/test_runner.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 COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
 #define COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
 
 #include <stdint.h>
 
 #include <deque>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "components/test_runner/layout_dump_flags.h"
 #include "components/test_runner/test_runner_export.h"
 #include "components/test_runner/web_task.h"
 #include "components/test_runner/web_test_runner.h"
 #include "v8/include/v8.h"
 
 class GURL;
 class SkBitmap;
 
 namespace blink {
 class WebContentSettingsClient;
@@ skipping 37 matching lines @@
 
   bool UseMockTheme() const { return use_mock_theme_; }
 
   void InvokeCallback(scoped_ptr<InvokeCallbackTask> callback);
 
   // WebTestRunner implementation.
   bool ShouldGeneratePixelResults() override;
   bool ShouldStayOnPageAfterHandlingBeforeUnload() const override;
   bool ShouldDumpAsAudio() const override;
   void GetAudioData(std::vector<unsigned char>* buffer_view) const override;
-  LayoutDumpFlags GetLayoutDumpFlags() override;
+  const LayoutDumpFlags& GetLayoutDumpFlags() override;
   bool HasCustomTextDump(std::string* custom_text_dump) const override;
   bool ShouldDumpBackForwardList() const override;
   blink::WebContentSettingsClient* GetWebContentSettings() const override;
 
   // Methods used by WebTestProxyBase.
   bool shouldDumpSelectionRect() const;
   bool isPrinting() const;
-  bool shouldDumpAsText();
   bool shouldDumpAsTextWithPixelResults();
   bool shouldDumpAsCustomText() const;
   std:: string customDumpText() const;
-  bool shouldDumpAsMarkup();
-  bool shouldDumpChildFrameScrollPositions() const;
-  bool shouldDumpChildFramesAsMarkup() const;
-  bool shouldDumpChildFramesAsText() const;
   void ShowDevTools(const std::string& settings,
                     const std::string& frontend_url);
   void ClearDevToolsLocalStorage();
   void setShouldDumpAsText(bool);
   void setShouldDumpAsMarkup(bool);
   void setCustomTextOutput(const std::string& text);
   void setShouldGeneratePixelResults(bool);
   void setShouldDumpFrameLoadCallbacks(bool);
   void setShouldDumpPingLoaderCallbacks(bool);
   void setShouldEnableViewSource(bool);
@@ skipping 605 matching lines @@
   // Bound variable to set whether postMessages should be intercepted or not
   bool intercept_post_message_;
 
   // If true, the test_shell will write a descriptive line for each editing
   // command.
   bool dump_editting_callbacks_;
 
   // If true, the test_shell will generate pixel results in DumpAsText mode
   bool generate_pixel_results_;
 
-  // If true, the test_shell will produce a plain text dump rather than a
-  // text representation of the renderer.
-  bool dump_as_text_;
-
-  // If true and if dump_as_text_ is true, the test_shell will recursively
-  // dump all frames as plain text.
-  bool dump_child_frames_as_text_;
-
-  // If true, the test_shell will produce a dump of the DOM rather than a text
-  // representation of the renderer.
-  bool dump_as_markup_;
-
-  // If true and if dump_as_markup_ is true, the test_shell will recursively
-  // produce a dump of the DOM rather than a text representation of the
-  // renderer.
-  bool dump_child_frames_as_markup_;
-
-  // If true, the test_shell will print out the child frame scroll offsets as
-  // well.
-  bool dump_child_frame_scroll_positions_;
+  // Flags controlling what content gets dumped as a layout text result.
+  LayoutDumpFlags layout_dump_flags_;
 
   // If true, the test_shell will print out the icon change notifications.
   bool dump_icon_changes_;
 
   // If true, the test_shell will output a base64 encoded WAVE file.
   bool dump_as_audio_;
 
   // If true, the test_shell will output a descriptive line for each frame
   // load callback.
   bool dump_frame_load_callbacks_;
@@ skipping 53 matching lines @@
   bool dump_navigation_policy_;
 
   // If true, pixel dump will be produced as a series of 1px-tall, view-wide
   // individual paints over the height of the view.
   bool test_repaint_;
 
   // If true and test_repaint_ is true as well, pixel dump will be produced as
   // a series of 1px-wide, view-tall paints across the width of the view.
   bool sweep_horizontally_;
 
-  // If true, layout is to target printed pages.
-  bool is_printing_;
-
   // If false, MockWebMIDIAccessor fails on startSession() for testing.
   bool midi_accessor_result_;
 
   bool should_stay_on_page_after_handling_before_unload_;
 
   bool should_dump_resource_priorities_;
 
   bool has_custom_text_output_;
   std::string custom_text_output_;
 
@@ skipping 25 matching lines @@
   bool use_mock_theme_;
 
   base::WeakPtrFactory<TestRunner> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRunner);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_