| Index: components/test_runner/test_runner.cc
|
| diff --git a/components/test_runner/test_runner.cc b/components/test_runner/test_runner.cc
|
| index a5cf1865625a7625876c0dd814bf72e812a35774..60fa315e8bb048352a952547f747d8d17e468600 100644
|
| --- a/components/test_runner/test_runner.cc
|
| +++ b/components/test_runner/test_runner.cc
|
| @@ -19,6 +19,7 @@
|
| #include "components/test_runner/mock_credential_manager_client.h"
|
| #include "components/test_runner/mock_screen_orientation_client.h"
|
| #include "components/test_runner/mock_web_speech_recognizer.h"
|
| +#include "components/test_runner/mock_web_user_media_client.h"
|
| #include "components/test_runner/test_interfaces.h"
|
| #include "components/test_runner/test_preferences.h"
|
| #include "components/test_runner/web_content_settings.h"
|
| @@ -1668,6 +1669,7 @@ TestRunner::TestRunner(TestInterfaces* interfaces)
|
| web_view_(nullptr),
|
| web_content_settings_(new WebContentSettings()),
|
| mock_screen_orientation_client_(new MockScreenOrientationClient),
|
| + chooser_count_(0),
|
| weak_factory_(this) {}
|
|
|
| TestRunner::~TestRunner() {}
|
| @@ -1762,6 +1764,7 @@ void TestRunner::Reset() {
|
|
|
| platform_name_ = "chromium";
|
| tooltip_text_ = std::string();
|
| + chooser_count_ = 0;
|
| web_history_item_count_ = 0;
|
| intercept_post_message_ = false;
|
|
|
| @@ -2515,6 +2518,12 @@ MockScreenOrientationClient* TestRunner::getMockScreenOrientationClient() {
|
| return mock_screen_orientation_client_.get();
|
| }
|
|
|
| +MockWebUserMediaClient* TestRunner::getMockWebUserMediaClient() {
|
| + if (!user_media_client_.get())
|
| + user_media_client_.reset(new MockWebUserMediaClient(delegate_));
|
| + return user_media_client_.get();
|
| +}
|
| +
|
| void TestRunner::SetMockScreenOrientation(const std::string& orientation_str) {
|
| blink::WebScreenOrientationType orientation;
|
|
|
| @@ -2539,6 +2548,14 @@ void TestRunner::DisableMockScreenOrientation() {
|
| mock_screen_orientation_client_->SetDisabled(true);
|
| }
|
|
|
| +void TestRunner::DidOpenChooser() {
|
| + chooser_count_++;
|
| +}
|
| +
|
| +void TestRunner::DidCloseChooser() {
|
| + chooser_count_--;
|
| +}
|
| +
|
| void TestRunner::DidAcquirePointerLock() {
|
| DidAcquirePointerLockInternal();
|
| }
|
| @@ -2848,7 +2865,7 @@ void TestRunner::CloseWebInspector() {
|
| }
|
|
|
| bool TestRunner::IsChooserShown() {
|
| - return proxy_->IsChooserShown();
|
| + return 0 < chooser_count_;
|
| }
|
|
|
| void TestRunner::EvaluateInWebInspector(int call_id,
|
|
|