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

Unified Diff: remoting/host/ipc_desktop_environment_unittest.cc

Issue 2458513004: Revert of Remove supports_touch_events flag from BasicDesktopEnvironment (Closed)
Patch Set: Created 4 years, 2 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 | « remoting/host/ipc_desktop_environment.cc ('k') | remoting/host/it2me_desktop_environment.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/ipc_desktop_environment_unittest.cc
diff --git a/remoting/host/ipc_desktop_environment_unittest.cc b/remoting/host/ipc_desktop_environment_unittest.cc
index 759d86b8ffe04fae686b0a0e297bce4eecfe5c76..6b2799790be0704a95167ec4dfb1f19e774525b2 100644
--- a/remoting/host/ipc_desktop_environment_unittest.cc
+++ b/remoting/host/ipc_desktop_environment_unittest.cc
@@ -514,6 +514,7 @@
// inject touch events.
TEST_F(IpcDesktopEnvironmentTest, TouchEventsCapabilities) {
// Create an environment with multi touch enabled.
+ desktop_environment_factory_->set_supports_touch_events(true);
desktop_environment_ = desktop_environment_factory_->Create(
client_session_control_factory_.GetWeakPtr());
@@ -522,11 +523,8 @@
EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
.Times(0);
- std::string expected_capabilities = "rateLimitResizeRequests";
- if (InputInjector::SupportsTouchEvents())
- expected_capabilities += " touchEvents";
-
- EXPECT_EQ(expected_capabilities, desktop_environment_->GetCapabilities());
+ EXPECT_EQ("rateLimitResizeRequests touchEvents",
+ desktop_environment_->GetCapabilities());
// Start the input injector and screen capturer.
input_injector_->Start(std::move(clipboard_stub));
« no previous file with comments | « remoting/host/ipc_desktop_environment.cc ('k') | remoting/host/it2me_desktop_environment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698