Index: components/test_runner/test_runner.h |
diff --git a/components/test_runner/test_runner.h b/components/test_runner/test_runner.h |
index 1c359e7fc51d71e67d4546aa2c37bab57a679c50..ea9215658d4854c0cd462dbd3883a2b95d4a31ca 100644 |
--- a/components/test_runner/test_runner.h |
+++ b/components/test_runner/test_runner.h |
@@ -15,7 +15,6 @@ |
#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" |
@@ -45,6 +44,7 @@ class TestInterfaces; |
class WebContentSettings; |
class WebTestDelegate; |
class WebTestProxyBase; |
+struct LayoutDumpFlags; |
class TestRunner : public WebTestRunner, |
public base::SupportsWeakPtr<TestRunner> { |
@@ -57,8 +57,6 @@ class TestRunner : public WebTestRunner, |
void SetDelegate(WebTestDelegate*); |
void SetWebView(blink::WebView*, WebTestProxyBase*); |
- void Reset(); |
- |
WebTaskList* mutable_task_list() { return &task_list_; } |
void SetTestIsRunning(bool); |
@@ -69,6 +67,9 @@ class TestRunner : public WebTestRunner, |
void InvokeCallback(scoped_ptr<InvokeCallbackTask> callback); |
// WebTestRunner implementation. |
+ void SetSharedLayoutDumpFlags( |
+ LayoutDumpFlags* shared_layout_dump_flags) override; |
+ void Reset() override; |
bool ShouldGeneratePixelResults() override; |
bool ShouldStayOnPageAfterHandlingBeforeUnload() const override; |
bool ShouldDumpAsAudio() const override; |
@@ -653,6 +654,16 @@ class TestRunner : public WebTestRunner, |
// Sets a flag causing the next call to DrawingBuffer::create to fail. |
void ForceNextDrawingBufferCreationToFail(); |
+ LayoutDumpFlags* layout_dump_flags() { |
+ CHECK(layout_dump_flags_); |
+ return layout_dump_flags_; |
+ } |
+ |
+ const LayoutDumpFlags* layout_dump_flags() const { |
+ CHECK(layout_dump_flags_); |
+ return layout_dump_flags_; |
+ } |
+ |
bool test_is_running_; |
// When reset is called, go through and close all but the main test shell |
@@ -660,9 +671,6 @@ class TestRunner : public WebTestRunner, |
// setCloseRemainingWindowsWhenComplete(). |
bool close_remaining_windows_; |
- // If true, don't dump output until notifyDone is called. |
- bool wait_until_done_; |
- |
// If true, ends the test when a URL is loaded externally via |
// WebFrameClient::loadURLExternally(). |
bool wait_until_external_url_load_; |
@@ -703,11 +711,8 @@ class TestRunner : public WebTestRunner, |
// command. |
bool dump_editting_callbacks_; |
- // If true, the test_shell will generate pixel results in DumpAsText mode |
- bool generate_pixel_results_; |
- |
// Flags controlling what content gets dumped as a layout text result. |
- LayoutDumpFlags layout_dump_flags_; |
+ LayoutDumpFlags* layout_dump_flags_; |
// If true, the test_shell will print out the icon change notifications. |
bool dump_icon_changes_; |