Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(397)

Unified Diff: components/test_runner/test_runner.cc

Issue 1847893002: Extract WebFrameClient implementation out of WebTestProxyBase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert some changes to mock_color_chooser.cc + fix counting of TestRunner::chooser_count_. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/test_runner/test_runner.h ('k') | components/test_runner/test_runner.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/test_runner/test_runner.cc
diff --git a/components/test_runner/test_runner.cc b/components/test_runner/test_runner.cc
index fa882749f813746de21cfdc307bbdf61b5a20df3..903f6360b96061964cbc1ec321ed7f5c597f91f3 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"
@@ -1667,6 +1668,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() {}
@@ -2518,6 +2520,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;
@@ -2542,6 +2550,15 @@ void TestRunner::DisableMockScreenOrientation() {
mock_screen_orientation_client_->SetDisabled(true);
}
+void TestRunner::DidOpenChooser() {
+ chooser_count_++;
+}
+
+void TestRunner::DidCloseChooser() {
+ chooser_count_--;
+ DCHECK_LE(0, chooser_count_);
+}
+
void TestRunner::DidAcquirePointerLock() {
DidAcquirePointerLockInternal();
}
@@ -2851,7 +2868,7 @@ void TestRunner::CloseWebInspector() {
}
bool TestRunner::IsChooserShown() {
- return proxy_->IsChooserShown();
+ return 0 < chooser_count_;
}
void TestRunner::EvaluateInWebInspector(int call_id,
« no previous file with comments | « components/test_runner/test_runner.h ('k') | components/test_runner/test_runner.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698