Move //chromeos/{=>ash/components}/dbus/debug_daemon
And the moved files are migrated from namespace chromeos to ash. Also, this CL removes its deps from public_deps entry of "dbus" components in //chromeos/dbus/BUILD.gn This CL is part of the Chrome OS source code directory migration: https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE. Bug: 1164001 Change-Id: I8c6104ea986c50b3fc9f2fe1cec88902abe16b5a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3787661 Commit-Queue: Yeunjoo Choi <ychoi@igalia.com> Reviewed-by: Hidehiko Abe <hidehiko@chromium.org> Owners-Override: Hidehiko Abe <hidehiko@chromium.org> Cr-Commit-Position: refs/heads/main@{#1029087}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
2829d8850a
commit
5c4d74b08a
ash
components
arc
webui
telemetry_extension_ui
services
chrome
browser
ash
BUILD.gnchrome_browser_main_parts_ash.ccconcierge_helper_service.cc
browser_process_platform_part_ash.cccrostini
dbus
guest_os
login
net
network_diagnostics
dns_resolver_present_routine_unittest.ccgateway_can_be_pinged_routine.ccgateway_can_be_pinged_routine.hgateway_can_be_pinged_routine_unittest.ccnetwork_diagnostics.ccnetwork_diagnostics.hnetwork_diagnostics_unittest.cc
network_health
notifications
plugin_vm
plugin_vm_installer.ccplugin_vm_installer_unittest.ccplugin_vm_manager_impl.ccplugin_vm_manager_impl_unittest.cc
policy
reporting
metrics_reporting
printing
scheduler_configuration_manager.ccscheduler_configuration_manager.hscheduler_configuration_manager_unittest.ccsystem_logs
debug_daemon_log_source.ccdebug_log_writer.ccsingle_debug_daemon_log_source.ccsingle_debug_daemon_log_source_unittest.cc
telemetry_extension
u2f_notification.ccchromeos
feedback
system_logs
metrics
perf
resource_coordinator
tab_manager_delegate_chromeos.cctab_manager_delegate_chromeos.htab_manager_delegate_chromeos_unittest.cc
support_tool
ui
views
webui
test
chromeos
ash
components
dbus
content
extensions/browser/api/diagnostics
rlz
@ -210,6 +210,7 @@ static_library("arc_base_utils") {
|
||||
"//ash/public/cpp",
|
||||
"//base",
|
||||
"//chromeos/ash/components/dbus/concierge:concierge_proto",
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/ash/components/dbus/session_manager",
|
||||
"//chromeos/ash/components/dbus/upstart:upstart",
|
||||
"//chromeos/dbus:dbus",
|
||||
|
@ -18,8 +18,8 @@
|
||||
#include "base/process/process_metrics.h"
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
#include "base/strings/string_util.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/upstart/upstart_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "components/exo/shell_surface_util.h"
|
||||
#include "components/user_manager/user_manager.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
|
@ -54,6 +54,7 @@ static_library("session") {
|
||||
"//ash/public/cpp",
|
||||
"//ash/public/cpp/external_arc:external_arc",
|
||||
"//chromeos/ash/components/dbus/concierge",
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/ash/components/dbus/session_manager",
|
||||
"//chromeos/ash/components/dbus/upstart",
|
||||
"//chromeos/ash/components/memory:memory",
|
||||
@ -130,9 +131,9 @@ source_set("unit_tests") {
|
||||
"//ash/constants",
|
||||
"//base/test:test_support",
|
||||
"//chromeos/ash/components/dbus/concierge",
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/ash/components/dbus/session_manager",
|
||||
"//chromeos/ash/components/dbus/upstart",
|
||||
"//chromeos/dbus",
|
||||
"//chromeos/dbus/dlcservice",
|
||||
"//chromeos/system:system",
|
||||
"//components/account_id",
|
||||
|
@ -11,8 +11,8 @@
|
||||
#include "base/command_line.h"
|
||||
#include "base/scoped_observation.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/upstart/fake_upstart_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
namespace arc {
|
||||
@ -30,13 +30,13 @@ class ArcClientAdapterTest : public testing::Test,
|
||||
void ArcInstanceStopped(bool is_system_shutdown) override {}
|
||||
|
||||
void SetUp() override {
|
||||
chromeos::DebugDaemonClient::InitializeFake();
|
||||
ash::DebugDaemonClient::InitializeFake();
|
||||
ash::ConciergeClient::InitializeFake(/*fake_cicerone_client=*/nullptr);
|
||||
ash::UpstartClient::InitializeFake();
|
||||
}
|
||||
void TearDown() override {
|
||||
ash::ConciergeClient::Shutdown();
|
||||
chromeos::DebugDaemonClient::Shutdown();
|
||||
ash::DebugDaemonClient::Shutdown();
|
||||
}
|
||||
|
||||
private:
|
||||
|
@ -56,10 +56,10 @@
|
||||
#include "base/time/time.h"
|
||||
#include "base/timer/elapsed_timer.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
|
||||
#include "chromeos/components/sensors/buildflags.h"
|
||||
#include "chromeos/dbus/common/dbus_method_call_status.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/system/core_scheduling.h"
|
||||
#include "chromeos/system/statistics_provider.h"
|
||||
#include "components/version_info/version_info.h"
|
||||
@ -113,8 +113,8 @@ ash::ConciergeClient* GetConciergeClient() {
|
||||
return ash::ConciergeClient::Get();
|
||||
}
|
||||
|
||||
chromeos::DebugDaemonClient* GetDebugDaemonClient() {
|
||||
return chromeos::DebugDaemonClient::Get();
|
||||
ash::DebugDaemonClient* GetDebugDaemonClient() {
|
||||
return ash::DebugDaemonClient::Get();
|
||||
}
|
||||
|
||||
ArcBinaryTranslationType IdentifyBinaryTranslationType(
|
||||
|
@ -50,10 +50,10 @@
|
||||
#include "base/test/scoped_run_loop_timeout.h"
|
||||
#include "base/time/time.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/fake_concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h"
|
||||
#include "chromeos/ash/components/dbus/upstart/fake_upstart_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "components/user_manager/user_names.h"
|
||||
#include "content/public/test/browser_task_environment.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
@ -145,7 +145,7 @@ bool HasDiskImage(const vm_tools::concierge::StartArcVmRequest& request,
|
||||
|
||||
// A debugd client that can fail to start Concierge.
|
||||
// TODO(yusukes): Merge the feature to FakeDebugDaemonClient.
|
||||
class TestDebugDaemonClient : public chromeos::FakeDebugDaemonClient {
|
||||
class TestDebugDaemonClient : public ash::FakeDebugDaemonClient {
|
||||
public:
|
||||
TestDebugDaemonClient() = default;
|
||||
|
||||
@ -351,8 +351,7 @@ class ArcVmClientAdapterTest : public testing::Test,
|
||||
|
||||
// Create and set new fake clients every time to reset clients' status.
|
||||
test_debug_daemon_client_ = std::make_unique<TestDebugDaemonClient>();
|
||||
chromeos::DebugDaemonClient::SetInstanceForTest(
|
||||
test_debug_daemon_client_.get());
|
||||
ash::DebugDaemonClient::SetInstanceForTest(test_debug_daemon_client_.get());
|
||||
TestConciergeClient::Initialize();
|
||||
ash::UpstartClient::InitializeFake();
|
||||
}
|
||||
@ -362,7 +361,7 @@ class ArcVmClientAdapterTest : public testing::Test,
|
||||
|
||||
~ArcVmClientAdapterTest() override {
|
||||
ash::ConciergeClient::Shutdown();
|
||||
chromeos::DebugDaemonClient::SetInstanceForTest(nullptr);
|
||||
ash::DebugDaemonClient::SetInstanceForTest(nullptr);
|
||||
test_debug_daemon_client_.reset();
|
||||
}
|
||||
|
||||
|
@ -26,10 +26,10 @@ source_set("telemetry_services") {
|
||||
"//ash/webui/telemetry_extension_ui/mojom",
|
||||
"//base",
|
||||
"//chrome/browser/ash/wilco_dtc_supportd:mojo_utils",
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/ash/services/cros_healthd/public/cpp",
|
||||
"//chromeos/ash/services/cros_healthd/public/mojom",
|
||||
"//chromeos/dbus",
|
||||
"//chromeos/dbus/debug_daemon",
|
||||
]
|
||||
}
|
||||
|
||||
@ -60,10 +60,10 @@ source_set("unit_tests") {
|
||||
"//base",
|
||||
"//base/test:test_support",
|
||||
"//chrome/browser/ash/wilco_dtc_supportd:mojo_utils",
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/ash/services/cros_healthd/public/cpp",
|
||||
"//chromeos/ash/services/cros_healthd/public/mojom",
|
||||
"//chromeos/dbus",
|
||||
"//chromeos/dbus/debug_daemon",
|
||||
"//testing/gmock",
|
||||
"//testing/gtest",
|
||||
]
|
||||
|
@ -1575,6 +1575,7 @@ source_set("ash") {
|
||||
"//chromeos/ash/components/dbus/concierge",
|
||||
"//chromeos/ash/components/dbus/concierge:concierge_proto",
|
||||
"//chromeos/ash/components/dbus/cros_disks",
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/ash/components/dbus/fusebox:proto",
|
||||
"//chromeos/ash/components/dbus/fwupd",
|
||||
"//chromeos/ash/components/dbus/gnubby",
|
||||
@ -1604,7 +1605,6 @@ source_set("ash") {
|
||||
"//chromeos/dbus/common",
|
||||
"//chromeos/dbus/constants",
|
||||
"//chromeos/dbus/cryptohome:cryptohome_proto",
|
||||
"//chromeos/dbus/debug_daemon",
|
||||
"//chromeos/dbus/dlcservice",
|
||||
"//chromeos/dbus/missive",
|
||||
"//chromeos/dbus/power",
|
||||
|
@ -199,6 +199,7 @@
|
||||
#include "chrome/common/logging_chrome.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "chromeos/ash/components/browser_context_helper/browser_context_helper.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/services/cros_dbus_service.h"
|
||||
#include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h"
|
||||
#include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
|
||||
@ -214,7 +215,6 @@
|
||||
#include "chromeos/components/sensors/ash/sensor_hal_dispatcher.h"
|
||||
#include "chromeos/dbus/constants/cryptohome_key_delegate_constants.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/power/fake_power_manager_client.h"
|
||||
#include "chromeos/dbus/power/power_manager_client.h"
|
||||
#include "chromeos/dbus/power/power_policy_controller.h"
|
||||
|
@ -9,7 +9,7 @@
|
||||
#include "base/no_destructor.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/concierge_service.pb.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "content/public/browser/browser_context.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
|
||||
|
@ -27,8 +27,8 @@
|
||||
#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/concierge_service.pb.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/fake_concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/seneschal/seneschal_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dlcservice/dlcservice_client.h"
|
||||
#include "content/public/test/browser_task_environment.h"
|
||||
#include "testing/gmock/include/gmock/gmock.h"
|
||||
@ -118,7 +118,7 @@ class CrostiniInstallerTest : public testing::Test {
|
||||
chromeos::DlcserviceClient::InitializeFake();
|
||||
ash::ChunneldClient::InitializeFake();
|
||||
ash::CiceroneClient::InitializeFake();
|
||||
chromeos::DebugDaemonClient::InitializeFake();
|
||||
ash::DebugDaemonClient::InitializeFake();
|
||||
SetOSRelease();
|
||||
waiting_fake_concierge_client_ =
|
||||
new WaitingFakeConciergeClient(ash::FakeCiceroneClient::Get());
|
||||
@ -153,7 +153,7 @@ class CrostiniInstallerTest : public testing::Test {
|
||||
|
||||
ash::disks::MockDiskMountManager::Shutdown();
|
||||
ash::SeneschalClient::Shutdown();
|
||||
chromeos::DebugDaemonClient::Shutdown();
|
||||
ash::DebugDaemonClient::Shutdown();
|
||||
ash::ConciergeClient::Shutdown();
|
||||
ash::CiceroneClient::Shutdown();
|
||||
ash::ChunneldClient::Shutdown();
|
||||
|
@ -45,10 +45,10 @@
|
||||
#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/concierge_service.pb.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/fake_concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/seneschal/seneschal_client.h"
|
||||
#include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h"
|
||||
#include "chromeos/ash/components/dbus/userdataauth/fake_cryptohome_misc_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dlcservice/dlcservice_client.h"
|
||||
#include "components/account_id/account_id.h"
|
||||
#include "components/policy/proto/chrome_device_policy.pb.h"
|
||||
@ -196,7 +196,7 @@ class CrostiniManagerTest : public testing::Test {
|
||||
ash::ChunneldClient::InitializeFake();
|
||||
ash::CiceroneClient::InitializeFake();
|
||||
ash::ConciergeClient::InitializeFake();
|
||||
chromeos::DebugDaemonClient::InitializeFake();
|
||||
ash::DebugDaemonClient::InitializeFake();
|
||||
ash::SeneschalClient::InitializeFake();
|
||||
fake_cicerone_client_ = ash::FakeCiceroneClient::Get();
|
||||
fake_concierge_client_ = ash::FakeConciergeClient::Get();
|
||||
@ -211,7 +211,7 @@ class CrostiniManagerTest : public testing::Test {
|
||||
~CrostiniManagerTest() override {
|
||||
ash::AnomalyDetectorClient::Shutdown();
|
||||
ash::SeneschalClient::Shutdown();
|
||||
chromeos::DebugDaemonClient::Shutdown();
|
||||
ash::DebugDaemonClient::Shutdown();
|
||||
ash::ConciergeClient::Shutdown();
|
||||
ash::CiceroneClient::Shutdown();
|
||||
ash::ChunneldClient::Shutdown();
|
||||
|
@ -19,8 +19,8 @@
|
||||
#include "chromeos/ash/components/dbus/cicerone/cicerone_client.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/fake_concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/seneschal/seneschal_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dlcservice/dlcservice_client.h"
|
||||
#include "content/public/test/browser_task_environment.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
@ -50,7 +50,7 @@ class CrostiniUtilTest : public testing::Test {
|
||||
ash::ChunneldClient::InitializeFake();
|
||||
ash::CiceroneClient::InitializeFake();
|
||||
ash::ConciergeClient::InitializeFake();
|
||||
chromeos::DebugDaemonClient::InitializeFake();
|
||||
ash::DebugDaemonClient::InitializeFake();
|
||||
ash::SeneschalClient::InitializeFake();
|
||||
|
||||
fake_concierge_client_ = ash::FakeConciergeClient::Get();
|
||||
@ -58,7 +58,7 @@ class CrostiniUtilTest : public testing::Test {
|
||||
|
||||
~CrostiniUtilTest() override {
|
||||
ash::SeneschalClient::Shutdown();
|
||||
chromeos::DebugDaemonClient::Shutdown();
|
||||
ash::DebugDaemonClient::Shutdown();
|
||||
ash::ConciergeClient::Shutdown();
|
||||
ash::CiceroneClient::Shutdown();
|
||||
ash::ChunneldClient::Shutdown();
|
||||
|
@ -36,6 +36,7 @@
|
||||
#include "chromeos/ash/components/dbus/cros_disks/cros_disks_client.h"
|
||||
#include "chromeos/ash/components/dbus/cros_healthd/cros_healthd_client.h"
|
||||
#include "chromeos/ash/components/dbus/cups_proxy/cups_proxy_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/federated/federated_client.h"
|
||||
#include "chromeos/ash/components/dbus/fusebox/fusebox_reverse_client.h"
|
||||
#include "chromeos/ash/components/dbus/fwupd/fwupd_client.h"
|
||||
@ -75,7 +76,6 @@
|
||||
#include "chromeos/ash/components/hibernate/buildflags.h" // ENABLE_HIBERNATE
|
||||
#include "chromeos/dbus/constants/dbus_paths.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dlcservice/dlcservice_client.h"
|
||||
#include "chromeos/dbus/dlp/dlp_client.h"
|
||||
#include "chromeos/dbus/easy_unlock/easy_unlock_client.h"
|
||||
|
@ -37,11 +37,11 @@
|
||||
#include "chromeos/ash/components/dbus/cicerone/cicerone_client.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/fake_concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/seneschal/fake_seneschal_client.h"
|
||||
#include "chromeos/ash/components/dbus/seneschal/seneschal_client.h"
|
||||
#include "chromeos/ash/components/dbus/seneschal/seneschal_service.pb.h"
|
||||
#include "chromeos/ash/components/dbus/vm_plugin_dispatcher/vm_plugin_dispatcher_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dlcservice/dlcservice_client.h"
|
||||
#include "components/account_id/account_id.h"
|
||||
#include "components/drive/drive_pref_names.h"
|
||||
@ -228,7 +228,7 @@ class GuestOsSharePathTest : public testing::Test {
|
||||
ash::ChunneldClient::InitializeFake();
|
||||
ash::CiceroneClient::InitializeFake();
|
||||
ash::ConciergeClient::InitializeFake();
|
||||
chromeos::DebugDaemonClient::InitializeFake();
|
||||
ash::DebugDaemonClient::InitializeFake();
|
||||
ash::SeneschalClient::InitializeFake();
|
||||
ash::VmPluginDispatcherClient::InitializeFake();
|
||||
|
||||
@ -242,7 +242,7 @@ class GuestOsSharePathTest : public testing::Test {
|
||||
~GuestOsSharePathTest() override {
|
||||
ash::VmPluginDispatcherClient::Shutdown();
|
||||
ash::SeneschalClient::Shutdown();
|
||||
chromeos::DebugDaemonClient::Shutdown();
|
||||
ash::DebugDaemonClient::Shutdown();
|
||||
ash::ConciergeClient::Shutdown();
|
||||
ash::CiceroneClient::Shutdown();
|
||||
ash::ChunneldClient::Shutdown();
|
||||
|
@ -26,11 +26,11 @@
|
||||
#include "chrome/common/chrome_paths.h"
|
||||
#include "chrome/common/chrome_switches.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/update_engine/fake_update_engine_client.h"
|
||||
#include "chromeos/dbus/constants/dbus_switches.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/dbus/power/fake_power_manager_client.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "content/public/test/browser_test.h"
|
||||
|
@ -36,9 +36,9 @@
|
||||
#include "chrome/browser/ui/webui/chromeos/login/welcome_screen_handler.h"
|
||||
#include "chrome/browser/ui/webui/chromeos/system_web_dialog_delegate.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "components/user_manager/known_user.h"
|
||||
|
@ -13,8 +13,8 @@
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/power/power_manager_client.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
|
@ -6,8 +6,8 @@
|
||||
#include "base/no_destructor.h"
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_test_helper.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
#include "third_party/cros_system_api/dbus/shill/dbus-constants.h"
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
#include "base/bind.h"
|
||||
#include "base/json/json_reader.h"
|
||||
#include "base/values.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/services/network_config/in_process_instance.h"
|
||||
#include "chromeos/services/network_config/public/cpp/cros_network_config_util.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
@ -43,7 +43,7 @@ constexpr base::TimeDelta kMaxAllowedLatencyMs = base::Milliseconds(1500);
|
||||
} // namespace
|
||||
|
||||
GatewayCanBePingedRoutine::GatewayCanBePingedRoutine(
|
||||
chromeos::DebugDaemonClient* debug_daemon_client)
|
||||
DebugDaemonClient* debug_daemon_client)
|
||||
: debug_daemon_client_(debug_daemon_client) {
|
||||
set_verdict(mojom::RoutineVerdict::kNotRun);
|
||||
GetNetworkConfigService(
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#include "base/time/time.h"
|
||||
#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/remote.h"
|
||||
|
||||
@ -21,8 +21,7 @@ namespace network_diagnostics {
|
||||
// Tests whether a device can ping all the gateways it is connected to.
|
||||
class GatewayCanBePingedRoutine : public NetworkDiagnosticsRoutine {
|
||||
public:
|
||||
explicit GatewayCanBePingedRoutine(
|
||||
chromeos::DebugDaemonClient* debug_daemon_client);
|
||||
explicit GatewayCanBePingedRoutine(DebugDaemonClient* debug_daemon_client);
|
||||
GatewayCanBePingedRoutine(const GatewayCanBePingedRoutine&) = delete;
|
||||
GatewayCanBePingedRoutine& operator=(const GatewayCanBePingedRoutine&) =
|
||||
delete;
|
||||
@ -53,7 +52,7 @@ class GatewayCanBePingedRoutine : public NetworkDiagnosticsRoutine {
|
||||
// |status| corresponds to that of the default network.
|
||||
void OnTestICMPCompleted(bool is_default_network_ping_result,
|
||||
const absl::optional<std::string> status);
|
||||
chromeos::DebugDaemonClient* debug_daemon_client() const {
|
||||
DebugDaemonClient* debug_daemon_client() const {
|
||||
DCHECK(debug_daemon_client_);
|
||||
return debug_daemon_client_;
|
||||
}
|
||||
@ -63,7 +62,7 @@ class GatewayCanBePingedRoutine : public NetworkDiagnosticsRoutine {
|
||||
std::vector<chromeos::network_diagnostics::mojom::GatewayCanBePingedProblem>
|
||||
problems_;
|
||||
// An unowned pointer to the DebugDaemonClient instance.
|
||||
chromeos::DebugDaemonClient* debug_daemon_client_;
|
||||
DebugDaemonClient* debug_daemon_client_;
|
||||
std::vector<std::string> gateways_;
|
||||
bool unreachable_gateways_ = true;
|
||||
int non_default_network_unsuccessful_ping_count_ = 0;
|
||||
|
@ -5,8 +5,8 @@
|
||||
#include "chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.h"
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_test_helper.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
#include "third_party/cros_system_api/dbus/shill/dbus-constants.h"
|
||||
|
||||
@ -63,7 +63,7 @@ const char kFakeNoReplyICMPOutput[] = R"(
|
||||
|
||||
// This fakes a DebugDaemonClient by serving fake ICMP results when the
|
||||
// DebugDaemonClient calls TestICMP().
|
||||
class FakeDebugDaemonClient : public chromeos::FakeDebugDaemonClient {
|
||||
class FakeDebugDaemonClient : public ash::FakeDebugDaemonClient {
|
||||
public:
|
||||
FakeDebugDaemonClient() = default;
|
||||
|
||||
|
@ -23,7 +23,7 @@
|
||||
#include "chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.h"
|
||||
#include "chrome/browser/ash/net/network_diagnostics/signal_strength_routine.h"
|
||||
#include "chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "components/device_event_log/device_event_log.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
|
||||
@ -33,8 +33,7 @@ namespace network_diagnostics {
|
||||
// TODO(https://crbug.com/1164001): remove when migrated to namespace ash.
|
||||
namespace mojom = ::chromeos::network_diagnostics::mojom;
|
||||
|
||||
NetworkDiagnostics::NetworkDiagnostics(
|
||||
chromeos::DebugDaemonClient* debug_daemon_client) {
|
||||
NetworkDiagnostics::NetworkDiagnostics(DebugDaemonClient* debug_daemon_client) {
|
||||
DCHECK(debug_daemon_client);
|
||||
if (debug_daemon_client) {
|
||||
debug_daemon_client_ = debug_daemon_client;
|
||||
|
@ -15,17 +15,16 @@
|
||||
#include "mojo/public/cpp/bindings/receiver_set.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
|
||||
namespace chromeos {
|
||||
class DebugDaemonClient;
|
||||
}
|
||||
|
||||
namespace ash {
|
||||
|
||||
class DebugDaemonClient;
|
||||
|
||||
namespace network_diagnostics {
|
||||
|
||||
class NetworkDiagnostics
|
||||
: public chromeos::network_diagnostics::mojom::NetworkDiagnosticsRoutines {
|
||||
public:
|
||||
explicit NetworkDiagnostics(chromeos::DebugDaemonClient* debug_daemon_client);
|
||||
explicit NetworkDiagnostics(DebugDaemonClient* debug_daemon_client);
|
||||
NetworkDiagnostics(const NetworkDiagnostics&) = delete;
|
||||
NetworkDiagnostics& operator=(const NetworkDiagnostics&) = delete;
|
||||
~NetworkDiagnostics() override;
|
||||
@ -66,7 +65,7 @@ class NetworkDiagnostics
|
||||
RoutineResultCallback callback,
|
||||
chromeos::network_diagnostics::mojom::RoutineResultPtr result);
|
||||
// An unowned pointer to the DebugDaemonClient instance.
|
||||
chromeos::DebugDaemonClient* debug_daemon_client_;
|
||||
DebugDaemonClient* debug_daemon_client_;
|
||||
// Receivers for external requests (WebUI, Feedback, CrosHealthdClient).
|
||||
mojo::ReceiverSet<
|
||||
chromeos::network_diagnostics::mojom::NetworkDiagnosticsRoutines>
|
||||
|
@ -9,7 +9,7 @@
|
||||
#include "base/test/bind.h"
|
||||
#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics.h"
|
||||
#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_test_helper.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/services/network_health/public/mojom/network_diagnostics.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/remote.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
@ -33,7 +33,7 @@ const std::vector<std::string> kWellFormedDnsServers = {
|
||||
|
||||
// This fakes a DebugDaemonClient by serving fake ICMP results when the
|
||||
// DebugDaemonClient calls TestICMP().
|
||||
class TestDebugDaemonClient : public chromeos::FakeDebugDaemonClient {
|
||||
class TestDebugDaemonClient : public FakeDebugDaemonClient {
|
||||
public:
|
||||
TestDebugDaemonClient() = default;
|
||||
TestDebugDaemonClient(const TestDebugDaemonClient&) = delete;
|
||||
|
@ -7,7 +7,7 @@
|
||||
#include "base/no_destructor.h"
|
||||
#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics.h"
|
||||
#include "chrome/browser/ash/net/network_health/network_health.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
|
||||
namespace ash {
|
||||
namespace network_health {
|
||||
@ -19,7 +19,7 @@ NetworkHealthService::NetworkHealthService() {
|
||||
network_health_ = std::make_unique<NetworkHealth>();
|
||||
network_diagnostics_ =
|
||||
std::make_unique<network_diagnostics::NetworkDiagnostics>(
|
||||
chromeos::DebugDaemonClient::Get());
|
||||
DebugDaemonClient::Get());
|
||||
}
|
||||
|
||||
mojo::PendingRemote<mojom::NetworkHealthService>
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include "base/callback_helpers.h"
|
||||
#include "base/logging.h"
|
||||
#include "base/memory/ref_counted.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
#include "ui/message_center/message_center.h"
|
||||
|
@ -8,7 +8,7 @@
|
||||
#include <memory>
|
||||
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
#include "ui/message_center/public/cpp/notification.h"
|
||||
|
||||
|
@ -8,9 +8,9 @@
|
||||
|
||||
#include "ash/test/ash_test_base.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "testing/gmock/include/gmock/gmock.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
#include "ui/message_center/message_center.h"
|
||||
@ -28,14 +28,14 @@ class DebugdNotificationHandlerTest : public AshTestBase {
|
||||
|
||||
void SetUp() override {
|
||||
AshTestBase::SetUp();
|
||||
debug_daemon_client_ = std::make_unique<chromeos::FakeDebugDaemonClient>();
|
||||
debug_daemon_client_ = std::make_unique<FakeDebugDaemonClient>();
|
||||
handler_ =
|
||||
std::make_unique<DebugdNotificationHandler>(debug_daemon_client_.get());
|
||||
message_center_ = message_center::MessageCenter::Get();
|
||||
}
|
||||
|
||||
protected:
|
||||
std::unique_ptr<chromeos::DebugDaemonClient> debug_daemon_client_;
|
||||
std::unique_ptr<DebugDaemonClient> debug_daemon_client_;
|
||||
std::unique_ptr<DebugdNotificationHandler> handler_;
|
||||
message_center::MessageCenter* message_center_;
|
||||
};
|
||||
|
@ -28,7 +28,7 @@
|
||||
#include "chrome/browser/download/background_download_service_factory.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/browser/profiles/profile_key.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dlcservice/dlcservice.pb.h"
|
||||
#include "components/download/public/background_service/background_download_service.h"
|
||||
#include "components/download/public/background_service/download_metadata.h"
|
||||
|
@ -28,9 +28,9 @@
|
||||
#include "chrome/test/base/testing_profile.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/fake_concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/vm_plugin_dispatcher/vm_plugin_dispatcher_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dlcservice/fake_dlcservice_client.h"
|
||||
#include "components/account_id/account_id.h"
|
||||
#include "components/download/public/background_service/test/test_download_service.h"
|
||||
@ -168,7 +168,7 @@ class PluginVmInstallerTestBase : public testing::Test {
|
||||
void SetUp() override {
|
||||
chromeos::DBusThreadManager::Initialize();
|
||||
ash::ConciergeClient::InitializeFake(/*fake_cicerone_client=*/nullptr);
|
||||
chromeos::DebugDaemonClient::InitializeFake();
|
||||
ash::DebugDaemonClient::InitializeFake();
|
||||
ash::VmPluginDispatcherClient::InitializeFake();
|
||||
|
||||
ASSERT_TRUE(profiles_dir_.CreateUniqueTempDir());
|
||||
@ -202,7 +202,7 @@ class PluginVmInstallerTestBase : public testing::Test {
|
||||
observer_.reset();
|
||||
|
||||
ash::VmPluginDispatcherClient::Shutdown();
|
||||
chromeos::DebugDaemonClient::Shutdown();
|
||||
ash::DebugDaemonClient::Shutdown();
|
||||
ash::ConciergeClient::Shutdown();
|
||||
chromeos::DBusThreadManager::Shutdown();
|
||||
chromeos::DlcserviceClient::Shutdown();
|
||||
|
@ -22,7 +22,7 @@
|
||||
#include "chrome/browser/ui/ash/shelf/shelf_spinner_item_controller.h"
|
||||
#include "chrome/browser/ui/simple_message_box.h"
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dlcservice/dlcservice.pb.h"
|
||||
#include "components/keyed_service/content/browser_context_dependency_manager.h"
|
||||
#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
|
||||
@ -145,7 +145,7 @@ void PluginVmManagerImpl::OnPrimaryUserSessionStarted() {
|
||||
if (reply.has_value()) {
|
||||
LOG(ERROR) << "New session has dispatcher unexpected already "
|
||||
"running. Perhaps Chrome crashed?";
|
||||
chromeos::DebugDaemonClient::Get()->StopPluginVmDispatcher(
|
||||
ash::DebugDaemonClient::Get()->StopPluginVmDispatcher(
|
||||
base::BindOnce([](bool success) {
|
||||
if (!success) {
|
||||
LOG(ERROR) << "Failed to stop the dispatcher";
|
||||
@ -391,7 +391,7 @@ void PluginVmManagerImpl::OnVmStateChanged(
|
||||
void PluginVmManagerImpl::StartDispatcher(
|
||||
base::OnceCallback<void(bool)> callback) const {
|
||||
LOG_FUNCTION_CALL();
|
||||
chromeos::DebugDaemonClient::Get()->StartPluginVmDispatcher(
|
||||
ash::DebugDaemonClient::Get()->StartPluginVmDispatcher(
|
||||
owner_id_, g_browser_process->GetApplicationLocale(),
|
||||
std::move(callback));
|
||||
}
|
||||
|
@ -27,12 +27,12 @@
|
||||
#include "chromeos/ash/components/dbus/cicerone/cicerone_client.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/fake_concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/seneschal/fake_seneschal_client.h"
|
||||
#include "chromeos/ash/components/dbus/seneschal/seneschal_client.h"
|
||||
#include "chromeos/ash/components/dbus/vm_plugin_dispatcher/fake_vm_plugin_dispatcher_client.h"
|
||||
#include "chromeos/ash/components/dbus/vm_plugin_dispatcher/vm_plugin_dispatcher_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dlcservice/fake_dlcservice_client.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "content/public/test/browser_task_environment.h"
|
||||
@ -55,7 +55,7 @@ class PluginVmManagerImplTest : public testing::Test {
|
||||
ash::ChunneldClient::InitializeFake();
|
||||
ash::CiceroneClient::InitializeFake();
|
||||
ash::ConciergeClient::InitializeFake();
|
||||
chromeos::DebugDaemonClient::InitializeFake();
|
||||
ash::DebugDaemonClient::InitializeFake();
|
||||
ash::SeneschalClient::InitializeFake();
|
||||
ash::VmPluginDispatcherClient::InitializeFake();
|
||||
testing_profile_ = std::make_unique<TestingProfile>();
|
||||
@ -97,7 +97,7 @@ class PluginVmManagerImplTest : public testing::Test {
|
||||
testing_profile_.reset();
|
||||
ash::VmPluginDispatcherClient::Shutdown();
|
||||
ash::SeneschalClient::Shutdown();
|
||||
chromeos::DebugDaemonClient::Shutdown();
|
||||
ash::DebugDaemonClient::Shutdown();
|
||||
ash::ConciergeClient::Shutdown();
|
||||
ash::CiceroneClient::Shutdown();
|
||||
ash::ChunneldClient::Shutdown();
|
||||
|
@ -17,8 +17,8 @@
|
||||
#include "base/threading/sequenced_task_runner_handle.h"
|
||||
#include "base/time/time.h"
|
||||
#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/network/network_handler_test_helper.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/services/network_health/public/mojom/network_diagnostics.mojom.h"
|
||||
#include "components/reporting/proto/synced/metric_data.pb.h"
|
||||
#include "components/reporting/util/test_support_callbacks.h"
|
||||
@ -110,7 +110,7 @@ class FakeNetworkDiagnostics : public NetworkDiagnostics {
|
||||
|
||||
RunHttpsLatencyCallback callback_;
|
||||
|
||||
::chromeos::FakeDebugDaemonClient fake_debug_daemon_client_;
|
||||
ash::FakeDebugDaemonClient fake_debug_daemon_client_;
|
||||
};
|
||||
|
||||
class FakeHttpsLatencyDelegate : public HttpsLatencySampler::Delegate {
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include "chrome/browser/component_updater/cros_component_installer_chromeos.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/common/webui_url_constants.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/printing/ppd_provider.h"
|
||||
#include "chromeos/printing/printer_configuration.h"
|
||||
#include "components/device_event_log/device_event_log.h"
|
||||
|
@ -23,8 +23,8 @@
|
||||
#include "chrome/browser/ash/printing/synced_printers_manager_factory.h"
|
||||
#include "chrome/browser/ash/printing/usb_printer_util.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/printing/ppd_provider.h"
|
||||
#include "chromeos/printing/usb_printer_id.h"
|
||||
#include "components/device_event_log/device_event_log.h"
|
||||
|
@ -12,7 +12,7 @@
|
||||
#include "chrome/common/chrome_features.h"
|
||||
#include "chrome/common/chrome_switches.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "components/prefs/pref_registry_simple.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "third_party/cros_system_api/dbus/debugd/dbus-constants.h"
|
||||
|
@ -8,8 +8,6 @@
|
||||
#include <utility>
|
||||
|
||||
#include "base/memory/weak_ptr.h"
|
||||
// TODO(https://crbug.com/1164001): move to forward declaration.
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/system/scheduler_configuration_manager_base.h"
|
||||
#include "components/prefs/pref_change_registrar.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
@ -19,6 +17,8 @@ class PrefService;
|
||||
|
||||
namespace ash {
|
||||
|
||||
class DebugDaemonClient;
|
||||
|
||||
// Tracks scheduler configuration as provided by the respective local state pref
|
||||
// and sends D-Bus IPC to reconfigure the system on config changes.
|
||||
//
|
||||
|
@ -12,7 +12,7 @@
|
||||
#include "base/test/task_environment.h"
|
||||
#include "chrome/common/chrome_features.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "components/prefs/testing_pref_service.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
#include "third_party/cros_system_api/dbus/debugd/dbus-constants.h"
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "chrome/browser/ash/profiles/profile_helper.h"
|
||||
#include "chrome/common/chrome_switches.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "components/feedback/feedback_util.h"
|
||||
#include "components/user_manager/user.h"
|
||||
#include "components/user_manager/user_manager.h"
|
||||
@ -142,7 +142,7 @@ void DebugDaemonLogSource::Fetch(SysLogsSourceCallback callback) {
|
||||
DCHECK(callback_.is_null());
|
||||
|
||||
callback_ = std::move(callback);
|
||||
chromeos::DebugDaemonClient* client = chromeos::DebugDaemonClient::Get();
|
||||
ash::DebugDaemonClient* client = ash::DebugDaemonClient::Get();
|
||||
|
||||
client->GetRoutes(true, // Numeric
|
||||
false, // No IPv6
|
||||
|
@ -19,7 +19,7 @@
|
||||
#include "base/task/sequenced_task_runner.h"
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "chrome/common/logging_chrome.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "content/public/browser/browser_task_traits.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
|
||||
@ -76,7 +76,7 @@ void WriteDebugLogToFile(std::unique_ptr<base::File> file,
|
||||
<< ", error: " << file->error_details();
|
||||
return;
|
||||
}
|
||||
chromeos::DebugDaemonClient::Get()->DumpDebugLogs(
|
||||
ash::DebugDaemonClient::Get()->DumpDebugLogs(
|
||||
should_compress, file->GetPlatformFile(),
|
||||
base::BindOnce(&WriteDebugLogToFileCompleted, file_path,
|
||||
std::move(callback)));
|
||||
|
@ -7,7 +7,7 @@
|
||||
#include <memory>
|
||||
|
||||
#include "base/bind.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
|
||||
namespace system_logs {
|
||||
@ -46,7 +46,7 @@ void SingleDebugDaemonLogSource::Fetch(SysLogsSourceCallback callback) {
|
||||
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
||||
DCHECK(!callback.is_null());
|
||||
|
||||
chromeos::DebugDaemonClient::Get()->GetLog(
|
||||
ash::DebugDaemonClient::Get()->GetLog(
|
||||
source_name(),
|
||||
base::BindOnce(&SingleDebugDaemonLogSource::OnFetchComplete,
|
||||
weak_ptr_factory_.GetWeakPtr(), source_name(),
|
||||
|
@ -9,8 +9,8 @@
|
||||
|
||||
#include "base/bind.h"
|
||||
#include "base/run_loop.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "content/public/test/browser_task_environment.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
@ -31,11 +31,11 @@ class SingleDebugDaemonLogSourceTest : public ::testing::Test {
|
||||
// Since no debug daemon will be available during a unit test, use
|
||||
// FakeDebugDaemonClient to provide dummy DebugDaemonClient functionality.
|
||||
chromeos::DBusThreadManager::Initialize();
|
||||
chromeos::DebugDaemonClient::InitializeFake();
|
||||
ash::DebugDaemonClient::InitializeFake();
|
||||
}
|
||||
|
||||
void TearDown() override {
|
||||
chromeos::DebugDaemonClient::Shutdown();
|
||||
ash::DebugDaemonClient::Shutdown();
|
||||
chromeos::DBusThreadManager::Shutdown();
|
||||
}
|
||||
|
||||
|
@ -16,11 +16,11 @@ source_set("telemetry_extension") {
|
||||
|
||||
deps = [
|
||||
"//base",
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/ash/services/cros_healthd/public/cpp",
|
||||
"//chromeos/ash/services/cros_healthd/public/mojom",
|
||||
"//chromeos/crosapi/mojom",
|
||||
"//chromeos/dbus",
|
||||
"//chromeos/dbus/debug_daemon",
|
||||
]
|
||||
}
|
||||
|
||||
@ -49,11 +49,11 @@ source_set("unit_tests") {
|
||||
":telemetry_extension",
|
||||
"//base",
|
||||
"//base/test:test_support",
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/ash/services/cros_healthd/public/cpp",
|
||||
"//chromeos/ash/services/cros_healthd/public/mojom",
|
||||
"//chromeos/crosapi/mojom",
|
||||
"//chromeos/dbus",
|
||||
"//chromeos/dbus/debug_daemon",
|
||||
"//testing/gmock",
|
||||
"//testing/gtest",
|
||||
]
|
||||
|
@ -9,9 +9,9 @@
|
||||
#include "base/bind.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "chrome/browser/ash/telemetry_extension/probe_service_converters.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/services/cros_healthd/public/cpp/service_connection.h"
|
||||
#include "chromeos/ash/services/cros_healthd/public/mojom/cros_healthd_probe.mojom.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
|
||||
namespace ash {
|
||||
@ -62,7 +62,7 @@ void ProbeService::ProbeTelemetryInfo(
|
||||
}
|
||||
|
||||
void ProbeService::GetOemData(GetOemDataCallback callback) {
|
||||
chromeos::DebugDaemonClient::Get()->GetLog(
|
||||
DebugDaemonClient::Get()->GetLog(
|
||||
kOemDataLogName,
|
||||
base::BindOnce(
|
||||
[](GetOemDataCallback callback,
|
||||
|
@ -10,9 +10,9 @@
|
||||
#include "base/bind.h"
|
||||
#include "base/test/bind.h"
|
||||
#include "base/test/task_environment.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/services/cros_healthd/public/cpp/fake_cros_healthd.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "mojo/public/cpp/bindings/remote.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
@ -26,13 +26,13 @@ class ProbeServiceTest : public testing::Test {
|
||||
public:
|
||||
void SetUp() override {
|
||||
chromeos::DBusThreadManager::Initialize();
|
||||
chromeos::DebugDaemonClient::InitializeFake();
|
||||
DebugDaemonClient::InitializeFake();
|
||||
cros_healthd::FakeCrosHealthd::Initialize();
|
||||
}
|
||||
|
||||
void TearDown() override {
|
||||
cros_healthd::FakeCrosHealthd::Shutdown();
|
||||
chromeos::DebugDaemonClient::Shutdown();
|
||||
DebugDaemonClient::Shutdown();
|
||||
chromeos::DBusThreadManager::Shutdown();
|
||||
}
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include "chrome/browser/ui/browser_navigator.h"
|
||||
#include "chrome/browser/ui/browser_navigator_params.h"
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "components/policy/proto/chrome_device_policy.pb.h"
|
||||
#include "components/strings/grit/components_strings.h"
|
||||
#include "third_party/cros_system_api/dbus/debugd/dbus-constants.h"
|
||||
|
@ -37,7 +37,7 @@
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/component_updater/metadata_table_chromeos.h"
|
||||
#include "chrome/common/chrome_switches.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "components/keep_alive_registry/keep_alive_types.h"
|
||||
#include "components/keep_alive_registry/scoped_keep_alive.h"
|
||||
#include "components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h"
|
||||
@ -161,7 +161,7 @@ void BrowserProcessPlatformPart::InitializeSchedulerConfigurationManager() {
|
||||
DCHECK(!scheduler_configuration_manager_);
|
||||
scheduler_configuration_manager_ =
|
||||
std::make_unique<ash::SchedulerConfigurationManager>(
|
||||
chromeos::DebugDaemonClient::Get(), g_browser_process->local_state());
|
||||
ash::DebugDaemonClient::Get(), g_browser_process->local_state());
|
||||
}
|
||||
|
||||
void BrowserProcessPlatformPart::ShutdownSchedulerConfigurationManager() {
|
||||
|
@ -265,6 +265,7 @@ source_set("chromeos") {
|
||||
"//chromeos/ash/components/dbus/cros_disks",
|
||||
"//chromeos/ash/components/dbus/cros_healthd",
|
||||
"//chromeos/ash/components/dbus/cups_proxy",
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/ash/components/dbus/federated",
|
||||
"//chromeos/ash/components/dbus/fusebox",
|
||||
"//chromeos/ash/components/dbus/fusebox:proto",
|
||||
|
@ -93,9 +93,9 @@ source_set("browser_tests") {
|
||||
"//chrome/browser/ash/wilco_dtc_supportd:mojo_utils",
|
||||
"//chrome/common/chromeos/extensions",
|
||||
"//chrome/test:test_support",
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/crosapi/mojom",
|
||||
"//chromeos/dbus",
|
||||
"//chromeos/dbus/debug_daemon",
|
||||
"//components/user_manager",
|
||||
"//content/test:test_support",
|
||||
"//extensions:test_support",
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
#include "base/threading/sequenced_task_runner_handle.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "content/public/browser/browser_task_traits.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
#endif
|
||||
@ -67,8 +67,7 @@ void CrashIdsSource::Fetch(SysLogsSourceCallback callback) {
|
||||
// Non-chromeOS systems upload crashes shortly after they happen. ChromeOS is
|
||||
// unique in that it has a separate process (crash_sender) that uploads
|
||||
// crashes periodically (by default every 5 minutes).
|
||||
chromeos::DebugDaemonClient* debugd_client =
|
||||
chromeos::DebugDaemonClient::Get();
|
||||
ash::DebugDaemonClient* debugd_client = ash::DebugDaemonClient::Get();
|
||||
if (debugd_client) {
|
||||
debugd_client->UploadCrashes(base::BindOnce(
|
||||
[](base::OnceClosure load_crash_list_cb, bool success) {
|
||||
|
@ -10,9 +10,9 @@
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h" // nogncheck
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#endif
|
||||
|
||||
namespace system_logs {
|
||||
@ -34,7 +34,7 @@ class StubUploadList : public UploadList {
|
||||
};
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
class TestDebugDaemonClient : public chromeos::FakeDebugDaemonClient {
|
||||
class TestDebugDaemonClient : public ash::FakeDebugDaemonClient {
|
||||
public:
|
||||
TestDebugDaemonClient() = default;
|
||||
|
||||
@ -59,7 +59,7 @@ TEST(CrashIdsSourceTest, CallsCrashSender) {
|
||||
|
||||
chromeos::DBusThreadManager::Initialize();
|
||||
TestDebugDaemonClient test_debug_client;
|
||||
chromeos::DebugDaemonClient::SetInstanceForTest(&test_debug_client);
|
||||
ash::DebugDaemonClient::SetInstanceForTest(&test_debug_client);
|
||||
|
||||
CrashIdsSource source;
|
||||
source.SetUploadListForTesting(new StubUploadList());
|
||||
@ -70,7 +70,7 @@ TEST(CrashIdsSourceTest, CallsCrashSender) {
|
||||
|
||||
EXPECT_EQ(1, test_debug_client.upload_crashes_called());
|
||||
|
||||
chromeos::DebugDaemonClient::SetInstanceForTest(nullptr);
|
||||
ash::DebugDaemonClient::SetInstanceForTest(nullptr);
|
||||
chromeos::DBusThreadManager::Shutdown();
|
||||
}
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include "chrome/browser/metrics/perf/process_type_collector.h"
|
||||
#include "chrome/browser/metrics/perf/windowed_incognito_observer.h"
|
||||
#include "chrome/browser/ui/browser_list.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client_provider.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client_provider.h"
|
||||
#include "components/variations/variations_associated_data.h"
|
||||
#include "third_party/metrics_proto/sampled_profile.pb.h"
|
||||
#include "third_party/re2/src/re2/re2.h"
|
||||
@ -377,8 +377,7 @@ void PerfCollector::SetUp() {
|
||||
|
||||
// Create DebugdClientProvider to bind its private DBus connection to the
|
||||
// current sequence.
|
||||
debugd_client_provider_ =
|
||||
std::make_unique<chromeos::DebugDaemonClientProvider>();
|
||||
debugd_client_provider_ = std::make_unique<ash::DebugDaemonClientProvider>();
|
||||
|
||||
auto task_runner = base::SequencedTaskRunnerHandle::Get();
|
||||
base::ThreadPool::PostTask(
|
||||
|
@ -18,14 +18,14 @@
|
||||
#include "third_party/metrics_proto/system_profile.pb.h"
|
||||
#include "third_party/re2/src/re2/stringpiece.h"
|
||||
|
||||
namespace ash {
|
||||
class DebugDaemonClientProvider;
|
||||
}
|
||||
|
||||
namespace base {
|
||||
class SequencedTaskRunner;
|
||||
}
|
||||
|
||||
namespace chromeos {
|
||||
class DebugDaemonClientProvider;
|
||||
} // namespace chromeos
|
||||
|
||||
namespace metrics {
|
||||
|
||||
struct CPUIdentity;
|
||||
@ -164,7 +164,7 @@ class PerfCollector : public internal::MetricCollector {
|
||||
RandomSelector command_selector_;
|
||||
|
||||
// |debugd_client_provider_| hosts the private DBus connection to debugd.
|
||||
std::unique_ptr<chromeos::DebugDaemonClientProvider> debugd_client_provider_;
|
||||
std::unique_ptr<ash::DebugDaemonClientProvider> debugd_client_provider_;
|
||||
|
||||
// An active call to perf/quipper, if set.
|
||||
std::unique_ptr<PerfOutputCall> perf_output_call_;
|
||||
|
@ -7,7 +7,7 @@
|
||||
#include "base/bind.h"
|
||||
#include "base/callback_helpers.h"
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "dbus/bus.h"
|
||||
#include "dbus/message.h"
|
||||
#include "dbus/object_path.h"
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
namespace metrics {
|
||||
|
||||
PerfOutputCall::PerfOutputCall(chromeos::DebugDaemonClient* debug_daemon_client,
|
||||
PerfOutputCall::PerfOutputCall(ash::DebugDaemonClient* debug_daemon_client,
|
||||
const std::vector<std::string>& quipper_args,
|
||||
bool disable_cpu_idle,
|
||||
DoneCallback callback)
|
||||
|
@ -17,9 +17,9 @@
|
||||
#include "chromeos/dbus/common/pipe_reader.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
|
||||
namespace chromeos {
|
||||
namespace ash {
|
||||
class DebugDaemonClient;
|
||||
} // namespace chromeos
|
||||
}
|
||||
|
||||
namespace metrics {
|
||||
|
||||
@ -35,7 +35,7 @@ class PerfOutputCall {
|
||||
// The output is transferred to |perf_stdout|.
|
||||
using DoneCallback = base::OnceCallback<void(std::string perf_stdout)>;
|
||||
|
||||
PerfOutputCall(chromeos::DebugDaemonClient* debug_daemon_client,
|
||||
PerfOutputCall(ash::DebugDaemonClient* debug_daemon_client,
|
||||
const std::vector<std::string>& quipper_args,
|
||||
bool disable_cpu_idle,
|
||||
DoneCallback callback);
|
||||
@ -60,7 +60,7 @@ class PerfOutputCall {
|
||||
void StopImpl();
|
||||
|
||||
// A non-retaining pointer to the DebugDaemonClient instance.
|
||||
chromeos::DebugDaemonClient* debug_daemon_client_;
|
||||
ash::DebugDaemonClient* debug_daemon_client_;
|
||||
|
||||
// Used to capture perf data written to a pipe.
|
||||
std::unique_ptr<chromeos::PipeReader> perf_data_pipe_reader_;
|
||||
|
@ -13,7 +13,7 @@
|
||||
#include "base/posix/eintr_wrapper.h"
|
||||
#include "base/threading/sequenced_task_runner_handle.h"
|
||||
#include "base/threading/thread_restrictions.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "content/public/test/browser_task_environment.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
#include "third_party/metrics_proto/sampled_profile.pb.h"
|
||||
@ -59,7 +59,7 @@ const std::vector<std::string> kQuipperArgs{
|
||||
|
||||
// This fakes DebugDaemonClient by serving example perf data when the profiling
|
||||
// duration elapses.
|
||||
class FakeDebugDaemonClient : public chromeos::FakeDebugDaemonClient {
|
||||
class FakeDebugDaemonClient : public ash::FakeDebugDaemonClient {
|
||||
public:
|
||||
FakeDebugDaemonClient()
|
||||
: task_runner_(base::SequencedTaskRunnerHandle::Get()) {}
|
||||
|
@ -41,8 +41,8 @@
|
||||
#include "chrome/browser/ui/browser_list.h"
|
||||
#include "chrome/browser/ui/browser_window.h"
|
||||
#include "chrome/browser/ui/tabs/tab_strip_model.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/memory/pressure/system_memory_pressure_evaluator.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "components/device_event_log/device_event_log.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
#include "content/public/browser/notification_service.h"
|
||||
@ -524,8 +524,8 @@ bool TabManagerDelegate::KillTab(LifecycleUnit* lifecycle_unit,
|
||||
return did_discard;
|
||||
}
|
||||
|
||||
chromeos::DebugDaemonClient* TabManagerDelegate::GetDebugDaemonClient() {
|
||||
return chromeos::DebugDaemonClient::Get();
|
||||
ash::DebugDaemonClient* TabManagerDelegate::GetDebugDaemonClient() {
|
||||
return ash::DebugDaemonClient::Get();
|
||||
}
|
||||
|
||||
void TabManagerDelegate::LowMemoryKillImpl(
|
||||
|
@ -25,7 +25,7 @@
|
||||
#include "chrome/browser/resource_coordinator/lifecycle_unit_state.mojom-forward.h"
|
||||
#include "chrome/browser/resource_coordinator/tab_manager.h"
|
||||
#include "chrome/browser/ui/browser_list_observer.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "content/public/browser/notification_observer.h"
|
||||
#include "content/public/browser/notification_registrar.h"
|
||||
#include "ui/wm/public/activation_change_observer.h"
|
||||
@ -107,7 +107,7 @@ class TabManagerDelegate : public wm::ActivationChangeObserver,
|
||||
::mojom::LifecycleUnitDiscardReason reason);
|
||||
|
||||
// Get debugd client instance. Virtual for unit testing.
|
||||
virtual chromeos::DebugDaemonClient* GetDebugDaemonClient();
|
||||
virtual ash::DebugDaemonClient* GetDebugDaemonClient();
|
||||
|
||||
private:
|
||||
FRIEND_TEST_ALL_PREFIXES(TabManagerDelegateTest, CandidatesSorted);
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include "chrome/browser/resource_coordinator/tab_manager_features.h"
|
||||
#include "chrome/browser/resource_coordinator/test_lifecycle_unit.h"
|
||||
#include "chrome/browser/resource_coordinator/time.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "content/public/test/browser_task_environment.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
@ -158,13 +158,13 @@ class MockTabManagerDelegate : public TabManagerDelegate {
|
||||
|
||||
LifecycleUnitVector GetLifecycleUnits() override { return lifecycle_units_; }
|
||||
|
||||
chromeos::DebugDaemonClient* GetDebugDaemonClient() override {
|
||||
ash::DebugDaemonClient* GetDebugDaemonClient() override {
|
||||
return &debugd_client_;
|
||||
}
|
||||
|
||||
private:
|
||||
LifecycleUnitVector lifecycle_units_;
|
||||
chromeos::FakeDebugDaemonClient debugd_client_;
|
||||
ash::FakeDebugDaemonClient debugd_client_;
|
||||
std::vector<int> killed_arc_processes_;
|
||||
LifecycleUnitVector killed_tabs_;
|
||||
bool always_return_true_from_is_recently_killed_;
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include "base/task/sequenced_task_runner.h"
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "chrome/browser/support_tool/data_collector.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "components/feedback/pii_types.h"
|
||||
#include "components/feedback/redaction_tool.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
@ -96,8 +96,7 @@ void NetworkRoutesDataCollector::CollectDataAndDetectPII(
|
||||
scoped_refptr<base::SequencedTaskRunner> task_runner_for_redaction_tool,
|
||||
scoped_refptr<feedback::RedactionToolContainer> redaction_tool_container) {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
chromeos::DebugDaemonClient* debugd_client =
|
||||
chromeos::DebugDaemonClient::Get();
|
||||
ash::DebugDaemonClient* debugd_client = ash::DebugDaemonClient::Get();
|
||||
// We will call DebugDaemonClient::GetRoutes twice to get IPv4 and IPv6 routes
|
||||
// in separate calls.
|
||||
size_t get_routes_calls = 2;
|
||||
|
@ -18,9 +18,9 @@
|
||||
#include "base/test/task_environment.h"
|
||||
#include "base/test/test_future.h"
|
||||
#include "chrome/browser/support_tool/data_collector.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "components/feedback/pii_types.h"
|
||||
#include "components/feedback/redaction_tool.h"
|
||||
#include "testing/gmock/include/gmock/gmock-matchers.h"
|
||||
@ -172,9 +172,8 @@ class NetworkRoutesDataCollectorTest : public ::testing::Test {
|
||||
void SetUp() override {
|
||||
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
|
||||
chromeos::DBusThreadManager::Initialize();
|
||||
chromeos::DebugDaemonClient::InitializeFake();
|
||||
static_cast<chromeos::FakeDebugDaemonClient*>(
|
||||
chromeos::DebugDaemonClient::Get())
|
||||
ash::DebugDaemonClient::InitializeFake();
|
||||
static_cast<ash::FakeDebugDaemonClient*>(ash::DebugDaemonClient::Get())
|
||||
->SetRoutesForTesting(fake_routes);
|
||||
}
|
||||
|
||||
@ -183,7 +182,7 @@ class NetworkRoutesDataCollectorTest : public ::testing::Test {
|
||||
return;
|
||||
EXPECT_TRUE(temp_dir_.Delete());
|
||||
|
||||
chromeos::DebugDaemonClient::Shutdown();
|
||||
ash::DebugDaemonClient::Shutdown();
|
||||
chromeos::DBusThreadManager::Shutdown();
|
||||
}
|
||||
|
||||
|
@ -23,8 +23,8 @@
|
||||
#include "chrome/common/chrome_features.h"
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/fake_concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/vm_plugin_dispatcher/fake_vm_plugin_dispatcher_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "components/account_id/account_id.h"
|
||||
#include "components/download/public/background_service/download_metadata.h"
|
||||
#include "components/download/public/background_service/features.h"
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
#include "chrome/browser/ui/webui/chromeos/login/base_webui_handler.h"
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "components/login/localized_values_builder.h"
|
||||
#include "third_party/cros_system_api/dbus/debugd/dbus-constants.h"
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/common/logging_chrome.h"
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "components/policy/core/browser/policy_conversions.h"
|
||||
#include "content/public/browser/web_contents.h"
|
||||
#include "content/public/browser/web_ui.h"
|
||||
|
@ -38,7 +38,7 @@
|
||||
#include "ui/base/resource/resource_bundle.h"
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
@ -159,8 +159,7 @@ void CrashesDOMHandler::HandleRequestCrashes(const base::Value::List& args) {
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
void CrashesDOMHandler::HandleRequestUploads(const base::Value::List& args) {
|
||||
chromeos::DebugDaemonClient* debugd_client =
|
||||
chromeos::DebugDaemonClient::Get();
|
||||
ash::DebugDaemonClient* debugd_client = ash::DebugDaemonClient::Get();
|
||||
DCHECK(debugd_client);
|
||||
|
||||
debugd_client->UploadCrashes(base::BindOnce([](bool success) {
|
||||
|
@ -39,7 +39,7 @@
|
||||
#include "chrome/browser/ui/webui/settings/chromeos/server_printer_url_util.h"
|
||||
#include "chrome/common/chrome_paths.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/printing/ppd_line_reader.h"
|
||||
#include "chromeos/printing/printer_configuration.h"
|
||||
#include "chromeos/printing/printer_translator.h"
|
||||
|
@ -19,8 +19,8 @@
|
||||
#include "chrome/browser/ui/chrome_select_file_policy.h"
|
||||
#include "chrome/test/base/testing_profile.h"
|
||||
#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "content/public/test/browser_task_environment.h"
|
||||
#include "content/public/test/test_web_ui.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
@ -7333,6 +7333,7 @@ test("unit_tests") {
|
||||
"//chromeos/ash/components/dbus/cicerone",
|
||||
"//chromeos/ash/components/dbus/concierge",
|
||||
"//chromeos/ash/components/dbus/cros_disks",
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/ash/components/dbus/hermes",
|
||||
"//chromeos/ash/components/dbus/image_loader",
|
||||
"//chromeos/ash/components/dbus/seneschal",
|
||||
@ -7347,7 +7348,6 @@ test("unit_tests") {
|
||||
"//chromeos/components/sync_wifi",
|
||||
"//chromeos/constants",
|
||||
"//chromeos/dbus",
|
||||
"//chromeos/dbus/debug_daemon",
|
||||
"//chromeos/dbus/permission_broker",
|
||||
"//chromeos/dbus/shill",
|
||||
"//chromeos/dbus/u2f",
|
||||
|
@ -2,7 +2,9 @@
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos")
|
||||
import("//build/config/chromeos/ui_mode.gni")
|
||||
|
||||
assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //chromeos/ash")
|
||||
|
||||
component("debug_daemon") {
|
||||
defines = [ "IS_DEBUG_DAEMON_IMPL" ]
|
@ -2,7 +2,7 @@
|
||||
// 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/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
|
||||
#include <dbus/dbus-protocol.h>
|
||||
#include <fcntl.h>
|
||||
@ -30,15 +30,15 @@
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "base/threading/thread_task_runner_handle.h"
|
||||
#include "base/trace_event/trace_config.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/dbus/common/pipe_reader.h"
|
||||
#include "chromeos/dbus/cryptohome/rpc.pb.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "dbus/bus.h"
|
||||
#include "dbus/message.h"
|
||||
#include "dbus/object_path.h"
|
||||
#include "dbus/object_proxy.h"
|
||||
|
||||
namespace chromeos {
|
||||
namespace ash {
|
||||
|
||||
namespace {
|
||||
|
||||
@ -117,7 +117,7 @@ class PipeReaderWrapper : public base::SupportsWeakPtr<PipeReaderWrapper> {
|
||||
delete this;
|
||||
}
|
||||
|
||||
PipeReader pipe_reader_;
|
||||
chromeos::PipeReader pipe_reader_;
|
||||
DebugDaemonClient::GetLogsCallback callback_;
|
||||
};
|
||||
|
||||
@ -348,7 +348,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient {
|
||||
}
|
||||
|
||||
pipe_reader_ =
|
||||
std::make_unique<PipeReader>(stop_agent_tracing_task_runner_);
|
||||
std::make_unique<chromeos::PipeReader>(stop_agent_tracing_task_runner_);
|
||||
callback_ = std::move(callback);
|
||||
base::ScopedFD pipe_write_end = pipe_reader_->StartIO(base::BindOnce(
|
||||
&DebugDaemonClientImpl::OnIOComplete, weak_ptr_factory_.GetWeakPtr()));
|
||||
@ -1105,7 +1105,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient {
|
||||
}
|
||||
|
||||
dbus::ObjectProxy* debugdaemon_proxy_;
|
||||
std::unique_ptr<PipeReader> pipe_reader_;
|
||||
std::unique_ptr<chromeos::PipeReader> pipe_reader_;
|
||||
StopAgentTracingCallback callback_;
|
||||
scoped_refptr<base::TaskRunner> stop_agent_tracing_task_runner_;
|
||||
base::ObserverList<Observer> observers_;
|
||||
@ -1157,4 +1157,4 @@ std::unique_ptr<DebugDaemonClient> DebugDaemonClient::CreateInstance() {
|
||||
return std::make_unique<DebugDaemonClientImpl>();
|
||||
}
|
||||
|
||||
} // namespace chromeos
|
||||
} // namespace ash
|
@ -2,8 +2,8 @@
|
||||
// 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_DEBUG_DAEMON_CLIENT_H_
|
||||
#define CHROMEOS_DBUS_DEBUG_DAEMON_DEBUG_DAEMON_CLIENT_H_
|
||||
#ifndef CHROMEOS_ASH_COMPONENTS_DBUS_DEBUG_DAEMON_DEBUG_DAEMON_CLIENT_H_
|
||||
#define CHROMEOS_ASH_COMPONENTS_DBUS_DEBUG_DAEMON_DEBUG_DAEMON_CLIENT_H_
|
||||
|
||||
#include <stdint.h>
|
||||
#include <sys/types.h>
|
||||
@ -28,7 +28,8 @@
|
||||
namespace cryptohome {
|
||||
class AccountIdentifier;
|
||||
}
|
||||
namespace chromeos {
|
||||
|
||||
namespace ash {
|
||||
|
||||
// A DbusLibraryError represents an error response received from D-Bus.
|
||||
enum DbusLibraryError {
|
||||
@ -353,13 +354,11 @@ class COMPONENT_EXPORT(DEBUG_DAEMON) DebugDaemonClient
|
||||
static std::unique_ptr<DebugDaemonClient> CreateInstance();
|
||||
};
|
||||
|
||||
} // namespace chromeos
|
||||
|
||||
// TODO(https://crbug.com/1164001): remove after the //chrome/browser/chromeos
|
||||
// source migration is finished.
|
||||
namespace ash {
|
||||
using ::chromeos::DbusLibraryError;
|
||||
using ::chromeos::DebugDaemonClient;
|
||||
} // namespace ash
|
||||
|
||||
#endif // CHROMEOS_DBUS_DEBUG_DAEMON_DEBUG_DAEMON_CLIENT_H_
|
||||
// TODO(https://crbug.com/1164001): remove when the migration is finished.
|
||||
namespace chromeos {
|
||||
using ::ash::DebugDaemonClient;
|
||||
}
|
||||
|
||||
#endif // CHROMEOS_ASH_COMPONENTS_DBUS_DEBUG_DAEMON_DEBUG_DAEMON_CLIENT_H_
|
@ -2,17 +2,17 @@
|
||||
// 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/debug_daemon_client_provider.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client_provider.h"
|
||||
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "dbus/bus.h"
|
||||
#include "dbus/message.h"
|
||||
#include "dbus/object_path.h"
|
||||
#include "dbus/object_proxy.h"
|
||||
#include "third_party/cros_system_api/dbus/service_constants.h"
|
||||
|
||||
namespace chromeos {
|
||||
namespace ash {
|
||||
|
||||
DebugDaemonClientProvider::DebugDaemonClientProvider()
|
||||
: dbus_task_runner_(base::ThreadPool::CreateSingleThreadTaskRunner(
|
||||
@ -36,4 +36,4 @@ DebugDaemonClientProvider::~DebugDaemonClientProvider() {
|
||||
FROM_HERE, base::BindOnce(&dbus::Bus::ShutdownAndBlock, dbus_bus_));
|
||||
}
|
||||
|
||||
} // namespace chromeos
|
||||
} // namespace ash
|
@ -2,8 +2,8 @@
|
||||
// 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_DEBUG_DAEMON_CLIENT_PROVIDER_H_
|
||||
#define CHROMEOS_DBUS_DEBUG_DAEMON_DEBUG_DAEMON_CLIENT_PROVIDER_H_
|
||||
#ifndef CHROMEOS_ASH_COMPONENTS_DBUS_DEBUG_DAEMON_DEBUG_DAEMON_CLIENT_PROVIDER_H_
|
||||
#define CHROMEOS_ASH_COMPONENTS_DBUS_DEBUG_DAEMON_DEBUG_DAEMON_CLIENT_PROVIDER_H_
|
||||
|
||||
#include <memory>
|
||||
|
||||
@ -14,7 +14,7 @@ namespace dbus {
|
||||
class Bus;
|
||||
} // namespace dbus
|
||||
|
||||
namespace chromeos {
|
||||
namespace ash {
|
||||
class DebugDaemonClient;
|
||||
|
||||
// This class hosts an instance of DebugDaemonClient used to connect to debugd
|
||||
@ -51,6 +51,6 @@ class COMPONENT_EXPORT(DEBUG_DAEMON) DebugDaemonClientProvider {
|
||||
std::unique_ptr<DebugDaemonClient> debug_daemon_client_;
|
||||
};
|
||||
|
||||
} // namespace chromeos
|
||||
} // namespace ash
|
||||
|
||||
#endif // CHROMEOS_DBUS_DEBUG_DAEMON_DEBUG_DAEMON_CLIENT_PROVIDER_H_
|
||||
#endif // CHROMEOS_ASH_COMPONENTS_DBUS_DEBUG_DAEMON_DEBUG_DAEMON_CLIENT_PROVIDER_H_
|
@ -2,7 +2,7 @@
|
||||
// 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/fake_debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
@ -30,7 +30,7 @@ const char kCrOSTraceLabel[] = "systemTraceEvents";
|
||||
|
||||
} // namespace
|
||||
|
||||
namespace chromeos {
|
||||
namespace ash {
|
||||
|
||||
FakeDebugDaemonClient::FakeDebugDaemonClient()
|
||||
: features_mask_(DebugDaemonClient::DEV_FEATURE_NONE),
|
||||
@ -359,4 +359,4 @@ void FakeDebugDaemonClient::StopPacketCapture(const std::string& handle) {
|
||||
PacketCaptureStopSignalReceived(nullptr);
|
||||
}
|
||||
|
||||
} // namespace chromeos
|
||||
} // namespace ash
|
@ -2,8 +2,8 @@
|
||||
// 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_FAKE_DEBUG_DAEMON_CLIENT_H_
|
||||
#define CHROMEOS_DBUS_DEBUG_DAEMON_FAKE_DEBUG_DAEMON_CLIENT_H_
|
||||
#ifndef CHROMEOS_ASH_COMPONENTS_DBUS_DEBUG_DAEMON_FAKE_DEBUG_DAEMON_CLIENT_H_
|
||||
#define CHROMEOS_ASH_COMPONENTS_DBUS_DEBUG_DAEMON_FAKE_DEBUG_DAEMON_CLIENT_H_
|
||||
|
||||
#include <stdint.h>
|
||||
#include <sys/types.h>
|
||||
@ -15,10 +15,10 @@
|
||||
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/observer_list.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/common/dbus_method_call_status.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
|
||||
namespace chromeos {
|
||||
namespace ash {
|
||||
|
||||
// The DebugDaemonClient implementation used on Linux desktop,
|
||||
// which does nothing.
|
||||
@ -156,11 +156,6 @@ class COMPONENT_EXPORT(DEBUG_DAEMON) FakeDebugDaemonClient
|
||||
base::ObserverList<Observer> observers_;
|
||||
};
|
||||
|
||||
} // namespace chromeos
|
||||
|
||||
// TODO(https://crbug.com/1164001): remove when //chromeos/dbus moved to ash.
|
||||
namespace ash {
|
||||
using ::chromeos::FakeDebugDaemonClient;
|
||||
} // namespace ash
|
||||
|
||||
#endif // CHROMEOS_DBUS_DEBUG_DAEMON_FAKE_DEBUG_DAEMON_CLIENT_H_
|
||||
#endif // CHROMEOS_ASH_COMPONENTS_DBUS_DEBUG_DAEMON_FAKE_DEBUG_DAEMON_CLIENT_H_
|
@ -12,6 +12,7 @@ component("memory") {
|
||||
defines = [ "IS_ASH_MEMORY_IMPL" ]
|
||||
deps = [
|
||||
"//base",
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/ash/components/dbus/resourced:resourced",
|
||||
"//chromeos/dbus",
|
||||
"//chromeos/dbus/constants",
|
||||
|
@ -3,6 +3,7 @@ include_rules = [
|
||||
"+third_party/zlib/google",
|
||||
"+third_party/re2",
|
||||
"+services/resource_coordinator",
|
||||
"+chromeos/ash/components/dbus/debug_daemon",
|
||||
"+chromeos/ash/components/dbus/resourced",
|
||||
"+components/memory_pressure",
|
||||
"+content/public/child",
|
||||
|
@ -10,7 +10,7 @@
|
||||
#include "base/metrics/field_trial_params.h"
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
#include "base/system/sys_info.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -64,8 +64,7 @@ void InitializeKstaled() {
|
||||
return;
|
||||
}
|
||||
|
||||
chromeos::DebugDaemonClient* debugd_client =
|
||||
chromeos::DebugDaemonClient::Get();
|
||||
DebugDaemonClient* debugd_client = DebugDaemonClient::Get();
|
||||
DCHECK(debugd_client);
|
||||
|
||||
debugd_client->SetKstaledRatio(static_cast<uint8_t>(feature_ratio),
|
||||
|
@ -8,8 +8,8 @@
|
||||
#include "base/component_export.h"
|
||||
#include "base/feature_list.h"
|
||||
#include "base/metrics/field_trial_params.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/resourced/resourced_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -108,8 +108,7 @@ void ConfigureMinFilelistIfEnabled() {
|
||||
return;
|
||||
}
|
||||
|
||||
chromeos::DebugDaemonClient* debugd_client =
|
||||
chromeos::DebugDaemonClient::Get();
|
||||
DebugDaemonClient* debugd_client = DebugDaemonClient::Get();
|
||||
CHECK(debugd_client);
|
||||
|
||||
int min_mb = kCrOSMinFilelistMb.Get();
|
||||
@ -128,8 +127,7 @@ void ConfigureRamVsSwapWeightIfEnabled() {
|
||||
if (!base::FeatureList::IsEnabled(kCrOSTuneRamVsSwapWeight))
|
||||
return;
|
||||
|
||||
chromeos::DebugDaemonClient* debugd_client =
|
||||
chromeos::DebugDaemonClient::Get();
|
||||
DebugDaemonClient* debugd_client = DebugDaemonClient::Get();
|
||||
CHECK(debugd_client);
|
||||
|
||||
int swap_weight = kCrOSRamVsSwapWeight.Get();
|
||||
@ -150,8 +148,7 @@ void ConfigureExtraFreeIfEnabled() {
|
||||
if (!base::FeatureList::IsEnabled(kCrOSTuneExtraFree))
|
||||
return;
|
||||
|
||||
chromeos::DebugDaemonClient* debugd_client =
|
||||
chromeos::DebugDaemonClient::Get();
|
||||
DebugDaemonClient* debugd_client = DebugDaemonClient::Get();
|
||||
CHECK(debugd_client);
|
||||
|
||||
int extra_free = kCrOSExtraFreeMb.Get();
|
||||
|
@ -16,8 +16,8 @@
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "base/threading/sequenced_task_runner_handle.h"
|
||||
#include "base/time/time.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
#include "third_party/re2/src/re2/re2.h"
|
||||
|
||||
@ -105,8 +105,7 @@ class ZramWritebackBackendImpl : public ZramWritebackBackend {
|
||||
}
|
||||
|
||||
void EnableWriteback(uint64_t size_mb, IntCallback cb) override {
|
||||
chromeos::DebugDaemonClient* debugd_client =
|
||||
chromeos::DebugDaemonClient::Get();
|
||||
DebugDaemonClient* debugd_client = DebugDaemonClient::Get();
|
||||
CHECK(debugd_client);
|
||||
|
||||
debugd_client->SwapZramEnableWriteback(
|
||||
@ -131,8 +130,7 @@ class ZramWritebackBackendImpl : public ZramWritebackBackend {
|
||||
}
|
||||
|
||||
void MarkIdle(base::TimeDelta age, Callback cb) override {
|
||||
chromeos::DebugDaemonClient* debugd_client =
|
||||
chromeos::DebugDaemonClient::Get();
|
||||
DebugDaemonClient* debugd_client = DebugDaemonClient::Get();
|
||||
CHECK(debugd_client);
|
||||
|
||||
debugd_client->SwapZramMarkIdle(
|
||||
@ -166,8 +164,7 @@ class ZramWritebackBackendImpl : public ZramWritebackBackend {
|
||||
}
|
||||
|
||||
void SetWritebackLimit(uint64_t size_pages, IntCallback cb) override {
|
||||
chromeos::DebugDaemonClient* debugd_client =
|
||||
chromeos::DebugDaemonClient::Get();
|
||||
DebugDaemonClient* debugd_client = DebugDaemonClient::Get();
|
||||
CHECK(debugd_client);
|
||||
|
||||
debugd_client->SwapZramSetWritebackLimit(
|
||||
@ -198,8 +195,7 @@ class ZramWritebackBackendImpl : public ZramWritebackBackend {
|
||||
}
|
||||
|
||||
void InitiateWriteback(ZramWritebackMode mode, Callback cb) override {
|
||||
chromeos::DebugDaemonClient* debugd_client =
|
||||
chromeos::DebugDaemonClient::Get();
|
||||
DebugDaemonClient* debugd_client = DebugDaemonClient::Get();
|
||||
CHECK(debugd_client);
|
||||
|
||||
debugd_client->InitiateSwapZramWriteback(
|
||||
|
@ -12,9 +12,6 @@ component("dbus") {
|
||||
public_deps = [
|
||||
"//chromeos/dbus/common",
|
||||
"//chromeos/dbus/constants",
|
||||
|
||||
# TODO(jamescook): Remove this and fix all build targets that need it.
|
||||
"//chromeos/dbus/debug_daemon",
|
||||
"//chromeos/dbus/init",
|
||||
"//chromeos/dbus/shill",
|
||||
"//dbus",
|
||||
|
@ -2474,6 +2474,8 @@ source_set("browser") {
|
||||
"tracing/cros_tracing_agent.h",
|
||||
]
|
||||
deps += [
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/dbus",
|
||||
"//components/chromeos_camera:mojo_mjpeg_decode_accelerator",
|
||||
"//services/data_decoder/public/cpp",
|
||||
"//services/data_decoder/public/mojom",
|
||||
@ -3092,9 +3094,6 @@ source_set("browser") {
|
||||
"//ash/constants",
|
||||
"//chromeos/ash/components/assistant:buildflags",
|
||||
"//chromeos/ash/components/network",
|
||||
"//chromeos/dbus",
|
||||
"//chromeos/dbus/power",
|
||||
"//chromeos/dbus/power:power_manager_proto",
|
||||
"//chromeos/system",
|
||||
"//components/session_manager/core",
|
||||
]
|
||||
|
@ -15,8 +15,8 @@
|
||||
#include "base/sequence_checker.h"
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "base/trace_event/trace_config.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "content/public/browser/browser_task_traits.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
#include "services/tracing/public/cpp/perfetto/perfetto_traced_process.h"
|
||||
@ -45,7 +45,7 @@ class CrOSSystemTracingSession {
|
||||
}
|
||||
|
||||
base::trace_event::TraceConfig trace_config(config);
|
||||
debug_daemon_ = chromeos::DebugDaemonClient::Get();
|
||||
debug_daemon_ = ash::DebugDaemonClient::Get();
|
||||
if (!trace_config.IsSystraceEnabled() || !debug_daemon_) {
|
||||
if (callback)
|
||||
std::move(callback).Run(/*success=*/false);
|
||||
@ -90,7 +90,7 @@ class CrOSSystemTracingSession {
|
||||
}
|
||||
|
||||
bool is_tracing_ = false;
|
||||
chromeos::DebugDaemonClient* debug_daemon_ = nullptr;
|
||||
ash::DebugDaemonClient* debug_daemon_ = nullptr;
|
||||
};
|
||||
|
||||
namespace {
|
||||
|
@ -34,7 +34,7 @@
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/system/fake_statistics_provider.h"
|
||||
#include "chromeos/system/statistics_provider.h"
|
||||
#endif
|
||||
@ -105,7 +105,7 @@ class TracingControllerTest : public ContentBrowserTest {
|
||||
disable_recording_done_callback_count_ = 0;
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
chromeos::DebugDaemonClient::InitializeFake();
|
||||
ash::DebugDaemonClient::InitializeFake();
|
||||
// Set statistic provider for hardware class tests.
|
||||
chromeos::system::StatisticsProvider::SetTestProvider(
|
||||
&fake_statistics_provider_);
|
||||
@ -118,7 +118,7 @@ class TracingControllerTest : public ContentBrowserTest {
|
||||
void TearDown() override {
|
||||
ContentBrowserTest::TearDown();
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
chromeos::DebugDaemonClient::Shutdown();
|
||||
ash::DebugDaemonClient::Shutdown();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -1906,7 +1906,7 @@ test("content_browsertests") {
|
||||
deps += [
|
||||
"//ash/components/audio",
|
||||
"//chromeos/ash/components/dbus/audio",
|
||||
"//chromeos/dbus/debug_daemon",
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/system",
|
||||
]
|
||||
}
|
||||
|
@ -17,8 +17,8 @@ source_set("diagnostics") {
|
||||
]
|
||||
|
||||
deps = [
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/dbus",
|
||||
"//chromeos/dbus/debug_daemon",
|
||||
"//extensions/common",
|
||||
"//extensions/common/api",
|
||||
]
|
||||
|
@ -9,7 +9,7 @@
|
||||
#include "base/json/json_reader.h"
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
#include "base/values.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
|
||||
namespace extensions {
|
||||
|
||||
@ -66,7 +66,7 @@ ExtensionFunction::ResponseAction DiagnosticsSendPacketFunction::Run() {
|
||||
if (params->options.size)
|
||||
config[kSize] = base::NumberToString(*params->options.size);
|
||||
|
||||
chromeos::DebugDaemonClient::Get()->TestICMPWithOptions(
|
||||
ash::DebugDaemonClient::Get()->TestICMPWithOptions(
|
||||
params->options.ip, config,
|
||||
base::BindOnce(&DiagnosticsSendPacketFunction::OnTestICMPCompleted,
|
||||
this));
|
||||
|
@ -85,6 +85,7 @@ if (enable_rlz_support) {
|
||||
"chromeos/lib/rlz_value_store_chromeos.h",
|
||||
]
|
||||
deps += [
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/dbus",
|
||||
"//chromeos/system",
|
||||
]
|
||||
@ -200,6 +201,7 @@ if (enable_rlz_support) {
|
||||
]
|
||||
if (is_chromeos_ash) {
|
||||
deps += [
|
||||
"//chromeos/ash/components/dbus/debug_daemon",
|
||||
"//chromeos/dbus:test_support",
|
||||
"//chromeos/system",
|
||||
]
|
||||
|
1
rlz/DEPS
1
rlz/DEPS
@ -4,6 +4,7 @@
|
||||
|
||||
include_rules = [
|
||||
"+build",
|
||||
"+chromeos/ash/components/dbus/debug_daemon",
|
||||
"+chromeos/dbus",
|
||||
"+chromeos/system",
|
||||
"+dbus",
|
||||
|
@ -24,8 +24,8 @@
|
||||
#include "base/strings/string_piece.h"
|
||||
#include "base/task/sequenced_task_runner.h"
|
||||
#include "base/values.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/system/factory_ping_embargo_check.h"
|
||||
#include "chromeos/system/statistics_provider.h"
|
||||
#include "dbus/bus.h"
|
||||
@ -137,7 +137,7 @@ void SetRlzPingSent(int retry_count) {
|
||||
return;
|
||||
}
|
||||
|
||||
chromeos::DebugDaemonClient::Get()->SetRlzPingSent(
|
||||
ash::DebugDaemonClient::Get()->SetRlzPingSent(
|
||||
base::BindOnce(&OnSetRlzPingSent, retry_count + 1));
|
||||
}
|
||||
|
||||
|
@ -52,9 +52,9 @@
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
#include "base/cxx17_backports.h"
|
||||
#include "base/files/important_file_writer.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
|
||||
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
|
||||
#include "rlz/chromeos/lib/rlz_value_store_chromeos.h"
|
||||
#endif
|
||||
|
||||
@ -1079,10 +1079,10 @@ TEST_F(RlzLibTest, LockAcquistionSucceedsButStoreFileCannotBeCreated) {
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
class ScopedTestDebugDaemonClient : public chromeos::FakeDebugDaemonClient {
|
||||
class ScopedTestDebugDaemonClient : public ash::FakeDebugDaemonClient {
|
||||
public:
|
||||
ScopedTestDebugDaemonClient() {
|
||||
chromeos::DebugDaemonClient::SetInstanceForTest(this);
|
||||
ash::DebugDaemonClient::SetInstanceForTest(this);
|
||||
}
|
||||
|
||||
ScopedTestDebugDaemonClient(const ScopedTestDebugDaemonClient&) = delete;
|
||||
@ -1090,7 +1090,7 @@ class ScopedTestDebugDaemonClient : public chromeos::FakeDebugDaemonClient {
|
||||
delete;
|
||||
|
||||
~ScopedTestDebugDaemonClient() override {
|
||||
chromeos::DebugDaemonClient::SetInstanceForTest(nullptr);
|
||||
ash::DebugDaemonClient::SetInstanceForTest(nullptr);
|
||||
}
|
||||
|
||||
int num_set_rlz_ping_sent() const { return num_set_rlz_ping_sent_; }
|
||||
|
Reference in New Issue
Block a user