Reland fix unit tests to enable them testing with the rAF aligned touch input.

content/renderer/input/main_thread_event_queue_unittest.cc

Index: content/renderer/input/main_thread_event_queue_unittest.cc
diff --git a/content/renderer/input/main_thread_event_queue_unittest.cc b/content/renderer/input/main_thread_event_queue_unittest.cc
index 1fe94ddd0c00acf6c9038170752db78726f559c6..21771186dc1df58896825851333af182ac9a73c5 100644
--- a/content/renderer/input/main_thread_event_queue_unittest.cc
+++ b/content/renderer/input/main_thread_event_queue_unittest.cc
@@ -59,13 +59,20 @@ class MainThreadEventQueueTest : public testing::TestWithParam<unsigned>,
         raf_aligned_input_setting_(GetParam()),
         needs_main_frame_(false) {
     std::vector<std::string> features;
-    if (raf_aligned_input_setting_ & kRafAlignedEnabledTouch)
+    std::vector<std::string> disabled_features;
+    if (raf_aligned_input_setting_ & kRafAlignedEnabledTouch) {
       features.push_back(features::kRafAlignedTouchInputEvents.name);
-    if (raf_aligned_input_setting_ & kRafAlignedEnabledMouse)
+    } else {
+      disabled_features.push_back(features::kRafAlignedTouchInputEvents.name);
+    }
+    if (raf_aligned_input_setting_ & kRafAlignedEnabledMouse) {
       features.push_back(features::kRafAlignedMouseInputEvents.name);
+    } else {
+      disabled_features.push_back(features::kRafAlignedMouseInputEvents.name);
+    }
 
     feature_list_.InitFromCommandLine(base::JoinString(features, ","),
-                                      std::string());
+                                      base::JoinString(disabled_features, ","));
   }
 
   void SetUp() override {