Remove supports_touch_events flag from BasicDesktopEnvironment

remoting/host/ipc_desktop_environment_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/ipc_desktop_environment.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
@@ skipping 473 matching lines @@
   // Start the input injector and screen capturer.
   input_injector_->Start(std::move(clipboard_stub));
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
   // Stop the test.
   DeleteDesktopEnvironment();
 }
 
-// Check Capabilities.
-TEST_F(IpcDesktopEnvironmentTest, CapabilitiesNoTouch) {
-  std::unique_ptr<protocol::MockClipboardStub> clipboard_stub(
-      new protocol::MockClipboardStub());
-  EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
-      .Times(0);
-
-  EXPECT_EQ("rateLimitResizeRequests", desktop_environment_->GetCapabilities());
-
-  // Start the input injector and screen capturer.
-  input_injector_->Start(std::move(clipboard_stub));
-
-  // Run the message loop until the desktop is attached.
-  setup_run_loop_->Run();
-
-  // Stop the test.
-  DeleteDesktopEnvironment();
-}
-
 // Check touchEvents capability is set when the desktop environment can
 // 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());
 
   std::unique_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(0);
 
-  EXPECT_EQ("rateLimitResizeRequests touchEvents",
-            desktop_environment_->GetCapabilities());
+  std::string expected_capabilities = "rateLimitResizeRequests";
+  if (InputInjector::SupportsTouchEvents())
+    expected_capabilities += " touchEvents";
+
+  EXPECT_EQ(expected_capabilities, desktop_environment_->GetCapabilities());
 
   // Start the input injector and screen capturer.
   input_injector_->Start(std::move(clipboard_stub));
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
   // Stop the test.
   DeleteDesktopEnvironment();
 }
@@ skipping 218 matching lines @@
       .WillOnce(InvokeWithoutArgs(
           this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
 
   // Change the desktop resolution.
   screen_controls_->SetScreenResolution(ScreenResolution(
       webrtc::DesktopSize(100, 100),
       webrtc::DesktopVector(96, 96)));
 }
 
 }  // namespace remoting