Added UI to enable debugging features on CrOS

chromeos/dbus/debug_daemon_client.cc

 // Copyright (c) 2012 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 "chromeos/dbus/debug_daemon_client.h"
 
 #include <fcntl.h>
 #include <unistd.h>
 #include <string>
 #include <vector>
@@ skipping 17 matching lines @@
 
 namespace {
 
 // Used in DebugDaemonClient::EmptySystemStopTracingCallback().
 void EmptyStopSystemTracingCallbackBody(
   const scoped_refptr<base::RefCountedString>& unused_result) {
 }
 
 }  // namespace
 
+namespace debugd {
+
+const char kEnableDebuggingFeatures[] = "EnableChromeDevFeatures";
+const char kRemoveRootfsVerification[] = "RemoveRootfsVerification";
+
+}

[xiyuan, 2014/10/30 03:52:09]

nit: }  // namespace debugd

[zel, 2014/10/31 01:22:26]

Done.

+
 namespace chromeos {
 
 // The DebugDaemonClient implementation used in production.
 class DebugDaemonClientImpl : public DebugDaemonClient {
  public:
   DebugDaemonClientImpl() : debugdaemon_proxy_(NULL), weak_ptr_factory_(this) {}
 
   virtual ~DebugDaemonClientImpl() {}
 
   // DebugDaemonClient override.
@@ skipping 247 matching lines @@
   virtual void UploadCrashes() override {
     dbus::MethodCall method_call(debugd::kDebugdInterface,
                                  debugd::kUploadCrashes);
     debugdaemon_proxy_->CallMethod(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&DebugDaemonClientImpl::OnStartMethod,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
+  virtual void EnableDebuggingFeatures(
+      const std::string& password,
+      const EnableDebuggingCallback& callback) override {
+    dbus::MethodCall method_call(debugd::kDebugdInterface,
+                                 debugd::kEnableDebuggingFeatures);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(password);
+    debugdaemon_proxy_->CallMethod(
+        &method_call,
+        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        base::Bind(&DebugDaemonClientImpl::OnEnableDebuggingFeatures,
+                   weak_ptr_factory_.GetWeakPtr(),
+                   callback));
+  }
+
+
+  virtual void RemoveRootfsVerification(

[xiyuan, 2014/10/30 03:52:09]

nit: move this before EnableDebuggingFeatures to match the order in header.

[zel, 2014/10/31 01:22:26]

Done.

+      const EnableDebuggingCallback& callback) override {
+    dbus::MethodCall method_call(debugd::kDebugdInterface,
+                                 debugd::kRemoveRootfsVerification);
+    dbus::MessageWriter writer(&method_call);
+    debugdaemon_proxy_->CallMethod(
+        &method_call,
+        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        base::Bind(&DebugDaemonClientImpl::OnRemoveRootfsVerification,
+                   weak_ptr_factory_.GetWeakPtr(),
+                   callback));
+  }
+
  protected:
   virtual void Init(dbus::Bus* bus) override {
     debugdaemon_proxy_ =
         bus->GetObjectProxy(debugd::kDebugdServiceName,
                             dbus::ObjectPath(debugd::kDebugdServicePath));
   }
 
  private:
   // Called when a CheckValidity response is received.
   void OnCheckValidityGetDebugLogs(bool is_compressed,
@@ skipping 137 matching lines @@
   }
 
   // Called when a response for a simple start is received.
   void OnStartMethod(dbus::Response* response) {
     if (!response) {
       LOG(ERROR) << "Failed to request start";
       return;
     }
   }
 
+  void OnEnableDebuggingFeatures(
+      const EnableDebuggingCallback& callback,
+      dbus::Response* response) {
+    if (callback.is_null())
+      return;
+
+    callback.Run(response != NULL);
+  }
+
+  void OnRemoveRootfsVerification(
+      const EnableDebuggingCallback& callback,
+      dbus::Response* response) {
+    if (callback.is_null())
+      return;
+
+    bool success = false;
+    if (!response || !dbus::MessageReader(response).PopBool(&success)) {
+      callback.Run(false);
+      return;
+    }
+
+    callback.Run(success);
+  }
+
   // Creates dbus::FileDescriptor from base::File.
   static scoped_ptr<dbus::FileDescriptor>
   CreateFileDescriptorToStopSystemTracing(base::File pipe_write_end) {
     if (!pipe_write_end.IsValid()) {
       LOG(ERROR) << "Cannot create pipe reader";
       // NB: continue anyway to shutdown tracing; toss trace data
       pipe_write_end.Initialize(base::FilePath(FILE_PATH_LITERAL("/dev/null")),
                                 base::File::FLAG_OPEN | base::File::FLAG_WRITE);
       // TODO(sleffler) if this fails AppendFileDescriptor will abort
     }
@@ skipping 73 matching lines @@
 DebugDaemonClient::EmptyStopSystemTracingCallback() {
   return base::Bind(&EmptyStopSystemTracingCallbackBody);
 }
 
 // static
 DebugDaemonClient* DebugDaemonClient::Create() {
   return new DebugDaemonClientImpl();
 }
 
 }  // namespace chromeos