Refactor debug_daemon_client.h to use debugd::DevFeatureFlag

chromeos/dbus/debug_daemon_client.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_DEBUG_DAEMON_CLIENT_H_
 #define CHROMEOS_DBUS_DEBUG_DAEMON_CLIENT_H_
 
+#include <map>
+
 #include "base/callback.h"
 #include "base/files/file.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/task_runner.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/dbus_client.h"
-
-#include <map>
+#include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace metrics {
 class PerfDataProto;
 }
 
 namespace chromeos {
 
 // DebugDaemonClient is used to communicate with the debug daemon.
 class CHROMEOS_EXPORT DebugDaemonClient : public DBusClient {
  public:
@@ skipping 122 matching lines @@
   // Called once EnableDebuggingFeatures() is complete. |succeeded| will be true
   // if debugging features have been successfully enabled.
   typedef base::Callback<void(bool succeeded)> EnableDebuggingCallback;
 
   // Enables debugging features (sshd, boot from USB). |password| is a new
   // password for root user. Can be only called in dev mode.
   virtual void EnableDebuggingFeatures(
       const std::string& password,
       const EnableDebuggingCallback& callback) = 0;
 
-  enum DebuggingFeature {
-    DEV_FEATURE_NONE                        = 0,
-    DEV_FEATURES_DISABLED                   = 1 << 0,
-    DEV_FEATURE_ROOTFS_VERIFICATION_REMOVED = 1 << 1,
-    DEV_FEATURE_BOOT_FROM_USB_ENABLED       = 1 << 2,
-    DEV_FEATURE_SSH_SERVER_CONFIGURED       = 1 << 3,
-    DEV_FEATURE_DEV_MODE_ROOT_PASSWORD_SET  = 1 << 4,
-    DEV_FEATURE_SYSTEM_ROOT_PASSWORD_SET    = 1 << 5,
-    DEV_FEATURE_ALL_ENABLED                 =
-        DEV_FEATURE_ROOTFS_VERIFICATION_REMOVED |
-        DEV_FEATURE_BOOT_FROM_USB_ENABLED |
-        DEV_FEATURE_SSH_SERVER_CONFIGURED |
-        DEV_FEATURE_DEV_MODE_ROOT_PASSWORD_SET |
-        DEV_FEATURE_DEV_MODE_ROOT_PASSWORD_SET,
-  };
+  static const int DEV_FEATURE_NONE = 0;
+  static const int DEV_FEATURE_ALL_ENABLED =
+      debugd::DevFeatureFlag::DEV_FEATURE_ROOTFS_VERIFICATION_REMOVED |
+      debugd::DevFeatureFlag::DEV_FEATURE_BOOT_FROM_USB_ENABLED |
+      debugd::DevFeatureFlag::DEV_FEATURE_SSH_SERVER_CONFIGURED |
+      debugd::DevFeatureFlag::DEV_FEATURE_DEV_MODE_ROOT_PASSWORD_SET;
 
   // Called once QueryDebuggingFeatures() is complete. |succeeded| will be true
   // if debugging features have been successfully enabled. |feature_mask| is a
   // bitmask made out of DebuggingFeature enum values.
   typedef base::Callback<void(bool succeeded,
                               int feature_mask)> QueryDevFeaturesCallback;
   // Checks which debugging features have been already enabled.
   virtual void QueryDebuggingFeatures(
       const QueryDevFeaturesCallback& callback) = 0;
 
@@ skipping 21 matching lines @@
   // Create() should be used instead.
   DebugDaemonClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DebugDaemonClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_DEBUG_DAEMON_CLIENT_H_