sync compositor: Merge input path with chrome

content/browser/android/synchronous_compositor_base.cc

 // Copyright 2015 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 "content/browser/android/synchronous_compositor_base.h"
 
 #include "base/command_line.h"
 #include "base/supports_user_data.h"
 #include "content/browser/android/in_process/synchronous_compositor_factory_impl.h"
 #include "content/browser/android/in_process/synchronous_compositor_impl.h"
@@ skipping 48 matching lines @@
     RenderWidgetHostViewAndroid* rwhva,
     WebContents* web_contents) {
   DCHECK(web_contents);
   WebContentsAndroid* web_contents_android =
       static_cast<WebContentsImpl*>(web_contents)->GetWebContentsAndroid();
   if (!web_contents_android->synchronous_compositor_client())
     return nullptr;  // Not using sync compositing.
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kIPCSyncCompositing)) {
+    bool async_input =
+        !command_line->HasSwitch(switches::kSyncInputForSyncCompositor);
     bool use_in_proc_software_draw =
         command_line->HasSwitch(switches::kSingleProcess);
     return make_scoped_ptr(new SynchronousCompositorHost(
         rwhva, web_contents_android->synchronous_compositor_client(),
-        use_in_proc_software_draw));
+        async_input, use_in_proc_software_draw));
   }
   return make_scoped_ptr(new SynchronousCompositorImpl(
       rwhva, web_contents_android->synchronous_compositor_client()));
 }
 
 }  // namespace content