Refactor debug_daemon_client.h to use debugd::DevFeatureFlag

chrome/browser/chromeos/login/enable_debugging_browsertest.cc

 // Copyright 2014 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 <string>
 
 #include "base/json/json_file_value_serializer.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/oobe_display.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_debug_daemon_client.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #include "chromeos/dbus/fake_update_engine_client.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 class TestDebugDaemonClient : public FakeDebugDaemonClient {
  public:
   TestDebugDaemonClient()
       : got_reply_(false),
         num_query_debugging_features_(0),
         num_enable_debugging_features_(0),
         num_remove_protection_(0) {
@@ skipping 201 matching lines @@
 
   void VerifyRemoveProtectionScreen() {
     JSExpect("!!document.querySelector('#debugging.remove-protection-view')");
     JSExpect("!document.querySelector('#debugging.setup-view')");
     JSExpect("!document.querySelector('#debugging.done-view')");
     JSExpect("!document.querySelector('#debugging.wait-view')");
   }
 
   void ShowSetupScreen() {
     debug_daemon_client_->SetDebuggingFeaturesStatus(
-        DebugDaemonClient::DEV_FEATURE_ROOTFS_VERIFICATION_REMOVED);
+        debugd::DevFeatureFlag::DEV_FEATURE_ROOTFS_VERIFICATION_REMOVED);
     WaitUntilJSIsReady();
     JSExpect("!!document.querySelector('#debugging.hidden')");
     InvokeEnableDebuggingScreen();
     JSExpect("!document.querySelector('#debugging.hidden')");
     debug_daemon_client_->WaitUntilCalled();
     base::MessageLoop::current()->RunUntilIdle();
     JSExpect("!document.querySelector('#debugging.remove-protection-view')");
     JSExpect("!!document.querySelector('#debugging.setup-view')");
     JSExpect("!document.querySelector('#debugging.done-view')");
     JSExpect("!document.querySelector('#debugging.wait-view')");
@@ skipping 39 matching lines @@
   base::MessageLoop::current()->RunUntilIdle();
   JSExpect("!!document.querySelector('#debugging.done-view')");
   EXPECT_EQ(debug_daemon_client_->num_enable_debugging_features(), 1);
   EXPECT_EQ(debug_daemon_client_->num_remove_protection(), 0);
 }
 
 // Test images come with some features enabled but still has rootfs protection.
 // Invoking debug screen should show remove protection screen.
 IN_PROC_BROWSER_TEST_F(EnableDebuggingTest, ShowOnTestImages) {
   debug_daemon_client_->SetDebuggingFeaturesStatus(
-      DebugDaemonClient::DEV_FEATURE_SSH_SERVER_CONFIGURED |
-      DebugDaemonClient::DEV_FEATURE_SYSTEM_ROOT_PASSWORD_SET);
+      debugd::DevFeatureFlag::DEV_FEATURE_SSH_SERVER_CONFIGURED |
+      debugd::DevFeatureFlag::DEV_FEATURE_SYSTEM_ROOT_PASSWORD_SET);
   WaitUntilJSIsReady();
   JSExpect("!!document.querySelector('#debugging.hidden')");
   InvokeEnableDebuggingScreen();
   JSExpect("!document.querySelector('#debugging.hidden')");
   debug_daemon_client_->WaitUntilCalled();
   base::MessageLoop::current()->RunUntilIdle();
   VerifyRemoveProtectionScreen();
 
   EXPECT_EQ(debug_daemon_client_->num_query_debugging_features(), 1);
   EXPECT_EQ(debug_daemon_client_->num_enable_debugging_features(), 0);
@@ skipping 69 matching lines @@
         user_data_dir.Append(chrome::kLocalStateFilename);
     CHECK(
         JSONFileValueSerializer(local_state_path).Serialize(local_state_dict));
 
     return EnableDebuggingTest::SetUpUserDataDirectory();
   }
   void SetUpInProcessBrowserTestFixture() override {
     EnableDebuggingTest::SetUpInProcessBrowserTestFixture();
 
     debug_daemon_client_->SetDebuggingFeaturesStatus(
-        DebugDaemonClient::DEV_FEATURE_ROOTFS_VERIFICATION_REMOVED);
+        debugd::DevFeatureFlag::DEV_FEATURE_ROOTFS_VERIFICATION_REMOVED);
   }
 };
 
 // Setup screen is automatically shown when the feature is requested.
 IN_PROC_BROWSER_TEST_F(EnableDebuggingRequestedTest, AutoShowSetup) {
   OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_ENABLE_DEBUGGING).Wait();
 }
 
 // Canceling auto shown setup screen should close it.
 IN_PROC_BROWSER_TEST_F(EnableDebuggingRequestedTest, CancelAutoShowSetup) {
   OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_ENABLE_DEBUGGING).Wait();
   CloseEnableDebuggingScreen();
   JSExpect("!!document.querySelector('#debugging.hidden')");
 }
 
 }  // namespace chromeos