| Index: components/test_runner/test_runner.h
|
| diff --git a/components/test_runner/test_runner.h b/components/test_runner/test_runner.h
|
| index be68d1db44fd409c1d85855bd5ac9ffd2b96adff..ed44368d8ed08852436e97b276e095416bde8aaf 100644
|
| --- a/components/test_runner/test_runner.h
|
| +++ b/components/test_runner/test_runner.h
|
| @@ -42,6 +42,7 @@ namespace test_runner {
|
|
|
| class InvokeCallbackTask;
|
| class MockScreenOrientationClient;
|
| +class MockWebUserMediaClient;
|
| class TestInterfaces;
|
| class WebContentSettings;
|
| class WebTestDelegate;
|
| @@ -81,9 +82,10 @@ class TestRunner : public WebTestRunner,
|
| bool ShouldDumpBackForwardList() const override;
|
| blink::WebContentSettingsClient* GetWebContentSettings() const override;
|
|
|
| - // Methods used by WebTestProxyBase.
|
| + // Methods used by WebTestProxyBase and WebFrameTestClient.
|
| bool shouldStayOnPageAfterHandlingBeforeUnload() const;
|
| MockScreenOrientationClient* getMockScreenOrientationClient();
|
| + MockWebUserMediaClient* getMockWebUserMediaClient();
|
| bool shouldDumpSelectionRect() const;
|
| bool isPrinting() const;
|
| bool shouldDumpAsTextWithPixelResults();
|
| @@ -131,6 +133,10 @@ class TestRunner : public WebTestRunner,
|
|
|
| bool midiAccessorResult();
|
|
|
| + // Methods used by MockColorChooser:
|
| + void DidOpenChooser();
|
| + void DidCloseChooser();
|
| +
|
| // A single item in the work queue.
|
| class WorkItem {
|
| public:
|
| @@ -817,6 +823,10 @@ class TestRunner : public WebTestRunner,
|
| bool use_mock_theme_;
|
|
|
| scoped_ptr<MockScreenOrientationClient> mock_screen_orientation_client_;
|
| + scoped_ptr<MockWebUserMediaClient> user_media_client_;
|
| +
|
| + // Number of currently active color choosers.
|
| + int chooser_count_;
|
|
|
| base::WeakPtrFactory<TestRunner> weak_factory_;
|
|
|
|
|