summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authorygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-12 11:12:13 +0000
committerygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-12 11:12:13 +0000
commit61d68f4f30b0cd17103ea368052acc9c43f22c65 (patch)
treec8a8c275792e21220aa745354c14c0b35f884b3a /chromeos
parentf603f326d4fe4eaa0d65cc70d60e7d24ffa8d195 (diff)
downloadchromium_src-61d68f4f30b0cd17103ea368052acc9c43f22c65.zip
chromium_src-61d68f4f30b0cd17103ea368052acc9c43f22c65.tar.gz
chromium_src-61d68f4f30b0cd17103ea368052acc9c43f22c65.tar.bz2
Revert 131963 - Added "Store Debug Logs" functionality. Logs from /var/log are gzipped
and stored on the fileshelf. BUG=chromium-os:25700 TEST= Review URL: http://codereview.chromium.org/9965072 TBR=ygorshenin@chromium.org Review URL: https://chromiumcodereview.appspot.com/10069009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/dbus/debug_daemon_client.cc30
-rw-r--r--chromeos/dbus/debug_daemon_client.h10
-rw-r--r--chromeos/dbus/mock_debug_daemon_client.h2
3 files changed, 0 insertions, 42 deletions
diff --git a/chromeos/dbus/debug_daemon_client.cc b/chromeos/dbus/debug_daemon_client.cc
index 50d9334..bc8e06d 100644
--- a/chromeos/dbus/debug_daemon_client.cc
+++ b/chromeos/dbus/debug_daemon_client.cc
@@ -150,22 +150,6 @@ class DebugDaemonClientImpl : public DebugDaemonClient {
virtual ~DebugDaemonClientImpl() {}
// DebugDaemonClient override.
- virtual void GetDebugLogs(base::PlatformFile file,
- const GetDebugLogsCallback& callback) OVERRIDE {
- dbus::MethodCall method_call(
- debugd::kDebugdInterface,
- debugd::kGetDebugLogs);
- dbus::MessageWriter writer(&method_call);
- writer.AppendFileDescriptor(dbus::FileDescriptor(file));
-
- debugdaemon_proxy_->CallMethod(
- &method_call,
- dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
- base::Bind(&DebugDaemonClientImpl::OnGetDebugLogs,
- weak_ptr_factory_.GetWeakPtr(),
- callback));
- }
-
virtual void StartSystemTracing() OVERRIDE {
dbus::MethodCall method_call(
debugd::kDebugdInterface,
@@ -225,16 +209,6 @@ class DebugDaemonClientImpl : public DebugDaemonClient {
}
private:
- void OnGetDebugLogs(const GetDebugLogsCallback& callback,
- dbus::Response* response) {
- if (!response) {
- LOG(ERROR) << "Failed to get debug logs";
- callback.Run(false);
- return;
- }
- callback.Run(true);
- }
-
// Called when a response for StartSystemTracing() is received.
void OnStartSystemTracing(dbus::Response* response) {
if (!response) {
@@ -270,10 +244,6 @@ class DebugDaemonClientImpl : public DebugDaemonClient {
// which does nothing.
class DebugDaemonClientStubImpl : public DebugDaemonClient {
// DebugDaemonClient overrides.
- virtual void GetDebugLogs(base::PlatformFile file,
- const GetDebugLogsCallback& callback) OVERRIDE {
- callback.Run(false);
- }
virtual void StartSystemTracing() OVERRIDE {}
virtual bool RequestStopSystemTracing(const StopSystemTracingCallback&
callback) OVERRIDE {
diff --git a/chromeos/dbus/debug_daemon_client.h b/chromeos/dbus/debug_daemon_client.h
index cc91a94..38e4015 100644
--- a/chromeos/dbus/debug_daemon_client.h
+++ b/chromeos/dbus/debug_daemon_client.h
@@ -6,7 +6,6 @@
#define CHROMEOS_DBUS_DEBUG_DAEMON_CLIENT_H_
#include "base/callback.h"
-#include "base/platform_file.h"
#include "base/memory/ref_counted_memory.h"
#include "chromeos/chromeos_export.h"
#include "chromeos/dbus/dbus_client_implementation_type.h"
@@ -22,15 +21,6 @@ class CHROMEOS_EXPORT DebugDaemonClient {
public:
virtual ~DebugDaemonClient();
- // Called once GetDebugLogs() is complete. Takes one parameter:
- // - succeeded: was the logs stored successfully.
- typedef base::Callback<void(bool succeeded)> GetDebugLogsCallback;
-
- // Requests to store debug logs into |file| and calls |callback|
- // when completed. Debug logs will be stored in the .tgz format.
- virtual void GetDebugLogs(base::PlatformFile file,
- const GetDebugLogsCallback& callback) = 0;
-
// Requests to start system/kernel tracing.
virtual void StartSystemTracing() = 0;
diff --git a/chromeos/dbus/mock_debug_daemon_client.h b/chromeos/dbus/mock_debug_daemon_client.h
index f55b98f6..05f553f 100644
--- a/chromeos/dbus/mock_debug_daemon_client.h
+++ b/chromeos/dbus/mock_debug_daemon_client.h
@@ -15,8 +15,6 @@ class MockDebugDaemonClient : public DebugDaemonClient {
MockDebugDaemonClient();
virtual ~MockDebugDaemonClient();
- MOCK_METHOD2(GetDebugLogs, void(base::PlatformFile,
- const GetDebugLogsCallback&));
MOCK_METHOD1(RequestStopSystemTracing,
bool(const StopSystemTracingCallback&));
MOCK_METHOD0(StartSystemTracing, void());