Merge 278301 "system_logs/touch_log_source: Updated path to log ..."

chrome/browser/chromeos/system_logs/touch_log_source.cc

Index: chrome/browser/chromeos/system_logs/touch_log_source.cc
===================================================================
--- chrome/browser/chromeos/system_logs/touch_log_source.cc	(revision 280391)
+++ chrome/browser/chromeos/system_logs/touch_log_source.cc	(working copy)
@@ -31,16 +31,16 @@
 
   std::vector<std::pair<std::string, CommandLine> > commands;
   CommandLine command =
-    CommandLine(base::FilePath("/opt/google/touchpad/tpcontrol"));
-  command.AppendArg("status");
+    CommandLine(base::FilePath("/opt/google/input/inputcontrol"));
+  command.AppendArg("--status");
   commands.push_back(std::make_pair("hack-33025-touchpad", command));
 
   command =
-    CommandLine(base::FilePath("/opt/google/touchpad/generate_userfeedback"));
+    CommandLine(base::FilePath("/opt/google/input/cmt_feedback"));
   commands.push_back(std::make_pair("hack-33025-touchpad_activity", command));
 
   command = CommandLine(
-      base::FilePath("/opt/google/touchscreen/touchscreen_feedback"));
+      base::FilePath("/opt/google/input/evdev_feedback"));
   commands.push_back(
       std::make_pair("hack-33025-touchscreen_activity", command));