Index: content/shell/renderer/layout_test/blink_test_runner.h |
diff --git a/content/shell/renderer/layout_test/blink_test_runner.h b/content/shell/renderer/layout_test/blink_test_runner.h |
index cb8de06646896cfbfd073a288c217c1b2cbb8186..0dc6f3ed70fbacd7e0c5919d0220ffd6ecfc2fe5 100644 |
--- a/content/shell/renderer/layout_test/blink_test_runner.h |
+++ b/content/shell/renderer/layout_test/blink_test_runner.h |
@@ -24,6 +24,10 @@ |
class SkBitmap; |
class SkCanvas; |
+namespace base { |
+class DictionaryValue; |
+} |
+ |
namespace blink { |
class WebDeviceMotionData; |
class WebDeviceOrientationData; |
@@ -31,6 +35,7 @@ struct WebRect; |
} |
namespace test_runner { |
+class LayoutDumpFlags; |
class WebTestProxyBase; |
} |
@@ -117,6 +122,8 @@ class BlinkTestRunner : public RenderViewObserver, |
void SetAcceptAllCookies(bool accept) override; |
std::string PathToLocalResource(const std::string& resource) override; |
void SetLocale(const std::string& locale) override; |
+ void OnLayoutDumpFlagsChanged( |
+ test_runner::LayoutDumpFlags* layout_dump_flags) override; |
void TestFinished() override; |
void CloseRemainingWindows() override; |
void DeleteAllCookies() override; |
@@ -171,7 +178,12 @@ class BlinkTestRunner : public RenderViewObserver, |
// Message handlers forwarded by LayoutTestRenderFrameObserver. |
void OnSetTestConfiguration(const ShellTestConfiguration& params); |
- void OnReplicateTestConfiguration(const ShellTestConfiguration& params); |
+ void OnReplicateTestConfiguration( |
+ const ShellTestConfiguration& params, |
+ const base::DictionaryValue& accumulated_layout_dump_flags_changes); |
+ void OnReplicateLayoutDumpFlagsChanges( |
+ const base::DictionaryValue& changed_layout_dump_flags, |
+ const std::string& change_originator_guid); |
private: |
// Message handlers. |
@@ -185,6 +197,9 @@ class BlinkTestRunner : public RenderViewObserver, |
void OnReplyBluetoothManualChooserEvents( |
const std::vector<std::string>& events); |
+ // Helpers. |
+ void SetTestConfiguration(const ShellTestConfiguration& params); |
+ |
// After finishing the test, retrieves the audio, text, and pixel dumps from |
// the TestRunner library and sends them to the browser process. |
void CaptureDump(); |
@@ -214,6 +229,8 @@ class BlinkTestRunner : public RenderViewObserver, |
scoped_ptr<LeakDetector> leak_detector_; |
+ std::string guid_; // Unique identifier of this BlinkTestRunner instance. |
+ |
DISALLOW_COPY_AND_ASSIGN(BlinkTestRunner); |
}; |