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

chrome/browser/chromeos/system_logs/touch_log_source.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 "chrome/browser/chromeos/system_logs/touch_log_source.h"
 
 #include "ash/touch/touch_hud_debug.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 13 matching lines @@
   if (!dictionary->empty()) {
     std::string touch_log;
     JSONStringValueSerializer json(&touch_log);
     json.set_pretty_print(true);
     if (json.Serialize(*dictionary) && !touch_log.empty())
       (*response)[kHUDLogDataKey] = touch_log;
   }
 
   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));
 
   for (size_t i = 0; i < commands.size(); ++i) {
     std::string output;
     base::GetAppOutput(commands[i].second, &output);
     (*response)[commands[i].first] = output;
   }
 }
 
@@ skipping 12 matching lines @@
   DCHECK(!callback.is_null());
 
   SystemLogsResponse* response = new SystemLogsResponse;
   BrowserThread::PostBlockingPoolTaskAndReply(
       FROM_HERE,
       base::Bind(&GetTouchLogs, response),
       base::Bind(callback, base::Owned(response)));
 }
 
 }  // namespace system_logs