Separate X11 implementation of touch log source

chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc

Index: chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc
diff --git a/chrome/browser/chromeos/system_logs/touch_log_source.cc b/chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc
similarity index 54%
copy from chrome/browser/chromeos/system_logs/touch_log_source.cc
copy to chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc
index 1f322b1fec1fe0b78ff411aba59db13962e701a6..116b3494f58d33c03cb66e09a30ef3b987a59fd5 100644
--- a/chrome/browser/chromeos/system_logs/touch_log_source.cc
+++ b/chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.

[achuithb, 2014/12/11 20:19:08]

Was this changed by clang_format? If not, don't change this.

[Shecky Lin, 2014/12/12 08:31:22]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,6 +8,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
+#include "base/logging.h"
 #include "base/process/launch.h"
 #include "components/feedback/feedback_util.h"
 #include "content/public/browser/browser_thread.h"
@@ -18,7 +19,7 @@ namespace {
 
 const char kHUDLogDataKey[] = "hud_log";
 
-void GetTouchLogs(system_logs::SystemLogsResponse* response) {
+void GetTouchLogsOzone(system_logs::SystemLogsResponse* response) {
   scoped_ptr<base::DictionaryValue> dictionary =
       ash::TouchHudDebug::GetAllAsDictionary();
   if (!dictionary->empty()) {
@@ -29,46 +30,21 @@ void GetTouchLogs(system_logs::SystemLogsResponse* response) {
       (*response)[kHUDLogDataKey] = touch_log;
   }
 
-  std::vector<std::pair<std::string, CommandLine> > commands;
-  CommandLine command =
-    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/input/cmt_feedback"));
-  commands.push_back(std::make_pair("hack-33025-touchpad_activity", command));
-
-  command = CommandLine(
-      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;
-  }
+  // TODO(sheckylin): Add ozone touch log collection implementation.

[achuithb, 2014/12/11 20:19:08]

Let's add a tracking bug id here as well.

[Shecky Lin, 2014/12/12 08:31:22]

Done.

+  NOTIMPLEMENTED();
 }
 
 }  // namespace
 
 namespace system_logs {
 
-TouchLogSource::TouchLogSource() : SystemLogsSource("Touch") {
-}
-
-TouchLogSource::~TouchLogSource() {
-}
-
 void TouchLogSource::Fetch(const SysLogsSourceCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   SystemLogsResponse* response = new SystemLogsResponse;
   BrowserThread::PostBlockingPoolTaskAndReply(
-      FROM_HERE,
-      base::Bind(&GetTouchLogs, response),
+      FROM_HERE, base::Bind(&GetTouchLogsOzone, response),

[achuithb, 2014/12/11 20:19:08]

Is this clang_format? If not, I think having base::Bind on the next line is
better.

[Shecky Lin, 2014/12/12 08:31:22]

It is clang_format. I'm keeping it thereby.

       base::Bind(callback, base::Owned(response)));
 }