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

content/renderer/input/main_thread_event_queue_unittest.cc

 // Copyright 2016 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 <stddef.h>
 
 #include <new>
 #include <utility>
 #include <vector>
 
@@ skipping 41 matching lines @@
 }  // namespace
 
 class MainThreadEventQueueTest : public testing::TestWithParam<unsigned>,
                                  public MainThreadEventQueueClient {
  public:
   MainThreadEventQueueTest()
       : main_task_runner_(new base::TestSimpleTaskRunner()),
         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 {
     queue_ = new MainThreadEventQueue(kTestRoutingID, this, main_task_runner_,
                                       &renderer_scheduler_);
   }
 
   void HandleEventOnMainThread(int routing_id,
                                const blink::WebCoalescedInputEvent* event,
                                const ui::LatencyInfo& latency,
@@ skipping 743 matching lines @@
       "MainThreadResponsivenessScrollIntervention", "Control");
   queue_ = new MainThreadEventQueue(kTestRoutingID,
                                     &dummy_main_thread_event_queue_client_,
                                     main_task_runner_, &renderer_scheduler_);
   EXPECT_FALSE(enable_non_blocking_due_to_main_thread_responsiveness_flag());
   EXPECT_EQ(base::TimeDelta::FromMilliseconds(0),
             main_thread_responsiveness_threshold());
 }
 
 }  // namespace content