Elim DBusThreadManager from ash unit tests

This also includes removal of unnecessary includes of dbus_thread_manager.h and improved DEPS restrictions. Bug: 951017 Change-Id: I5f75b3b01423a1a69e5929561bcc95b95a4e612c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1560444 Commit-Queue: Steven Bennetts <stevenjb@chromium.org> Reviewed-by: James Cook <jamescook@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org> Cr-Commit-Position: refs/heads/master@{#651761}
marcosholgado · Apr 17, 2019 · 5abd263 · 5abd263
1 parent ba53a47
commit 5abd263
Show file tree

Hide file tree

Showing 33 changed files with 39 additions and 70 deletions.
diff --git a/ash/DEPS b/ash/DEPS
@@ -59,22 +59,23 @@ include_rules = [
   "+chromeos/audio",
   "+chromeos/components/multidevice/logging/logging.h",
   "+chromeos/constants",
-  # TODO(stevenjb): Eliminate this. http://crbug.com/940810
+  # TODO(https://crbug.com/940810): Eliminate this.
   "+chromeos/dbus/audio",
-  "+chromeos/dbus/biod/biod_client.h",
+  # TODO(https://crbug.com/951017): Eliminate this.
   "+chromeos/dbus/dbus_thread_manager.h",
-  "+chromeos/dbus/fake_power_manager_client.h",
   "+chromeos/dbus/hammerd",
+  # TODO(https://crbug.com/644348): Eliminate this.
   "+chromeos/dbus/power",
   "+chromeos/dbus/power_manager",
-  "+chromeos/dbus/shill_device_client.h",
+  # TODO(https://crbug.com/644355): Eliminate this.
+  "+chromeos/dbus/shill",
   "+chromeos/dbus/system_clock",
-  # TODO(stevenjb): Eliminate this. http://crbug.com/644355
+  # TODO(https://crbug.com/644355): Eliminate this.
   "+chromeos/network",
   "+chromeos/services/assistant/public" ,
   "+chromeos/services/assistant/test_support",
   "+chromeos/services/multidevice_setup/public",
-  # TODO(jamescook): Eliminate this. http://crbug.com/644361
+  # TODO(https://crbug.com/644361): Eliminate this.
   "+chromeos/settings/timezone_settings.h",
   "+chromeos/strings",
   "+chromeos/system",

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
@@ -74,7 +74,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/system/sys_info.h"
 #include "chromeos/constants/chromeos_switches.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 #include "components/user_manager/user_type.h"
 #include "ui/base/accelerators/accelerator.h"

diff --git a/ash/accelerators/accelerator_unittest.cc b/ash/accelerators/accelerator_unittest.cc
@@ -18,6 +18,7 @@
 #include "ash/wm/window_util.h"
 #include "base/run_loop.h"
 #include "base/test/metrics/user_action_tester.h"
+#include "chromeos/dbus/shill/shill_clients.h"
 #include "chromeos/network/network_handler.h"
 #include "services/ws/public/mojom/window_tree_constants.mojom.h"
 #include "services/ws/test_window_tree_client.h"
@@ -70,11 +71,13 @@ class AcceleratorTest : public AshTestBase, public OverviewObserver {
 
     Shell::Get()->overview_controller()->AddObserver(this);
 
+    chromeos::shill_clients::InitializeFakes();
     chromeos::NetworkHandler::Initialize();
   }
 
   void TearDown() override {
     chromeos::NetworkHandler::Shutdown();
+    chromeos::shill_clients::Shutdown();
 
     Shell::Get()->overview_controller()->RemoveObserver(this);
 

diff --git a/ash/dbus/ash_dbus_services.cc b/ash/dbus/ash_dbus_services.cc
@@ -16,13 +16,11 @@
 namespace ash {
 
 AshDBusServices::AshDBusServices() {
-  // DBusThreadManager is initialized in Chrome or in AshService::InitForMash().
-  CHECK(chromeos::DBusThreadManager::IsInitialized());
-
   dbus::Bus* system_bus =
-      chromeos::DBusThreadManager::Get()->IsUsingFakes()
-          ? nullptr
-          : chromeos::DBusThreadManager::Get()->GetSystemBus();
+      chromeos::DBusThreadManager::IsInitialized() &&
+              !chromeos::DBusThreadManager::Get()->IsUsingFakes()
+          ? chromeos::DBusThreadManager::Get()->GetSystemBus()
+          : nullptr;
   display_service_ = chromeos::CrosDBusService::Create(
       system_bus, chromeos::kDisplayServiceName,
       dbus::ObjectPath(chromeos::kDisplayServicePath),

diff --git a/ash/detachable_base/detachable_base_handler.cc b/ash/detachable_base/detachable_base_handler.cc
@@ -10,7 +10,6 @@
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/account_id/account_id.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"

diff --git a/ash/display/projecting_observer.cc b/ash/display/projecting_observer.cc
@@ -6,7 +6,6 @@
 
 #include "ash/shell.h"
 #include "base/logging.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 #include "ui/display/types/display_snapshot.h"
 

diff --git a/ash/login/ui/lock_contents_view.cc b/ash/login/ui/lock_contents_view.cc
@@ -40,7 +40,6 @@
 #include "base/command_line.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/user_manager/user_type.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"

diff --git a/ash/login/ui/login_auth_user_view.cc b/ash/login/ui/login_auth_user_view.cc
@@ -29,7 +29,6 @@
 #include "base/i18n/time_formatting.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/user_manager/user.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"

diff --git a/ash/shell.cc b/ash/shell.cc
@@ -990,7 +990,9 @@ void Shell::Init(
   if (!::features::IsMultiProcessMash()) {
     // DBus clients only needed in Ash. For MultiProcessMash these are
     // initialized in AshService::InitializeDBusClients.
-    dbus::Bus* bus = chromeos::DBusThreadManager::Get()->GetSystemBus();
+    dbus::Bus* bus = chromeos::DBusThreadManager::IsInitialized()
+                         ? chromeos::DBusThreadManager::Get()->GetSystemBus()
+                         : nullptr;
     if (bus) {
       // Required by DetachableBaseHandler.
       chromeos::HammerdClient::Initialize(bus);

diff --git a/ash/shell/content/client/DEPS b/ash/shell/content/client/DEPS
@@ -1,6 +1,7 @@
 include_rules = [
   "+ash/components/shortcut_viewer",
   "+ash/components/tap_visualizer",
+  "+chromeos/dbus/biod",
   "+components/discardable_memory/public/interfaces",
   "+content/public",
   "+content/shell",

diff --git a/ash/shell/content/client/shell_browser_main_parts.cc b/ash/shell/content/client/shell_browser_main_parts.cc
@@ -33,7 +33,6 @@
 #include "base/time/time.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/biod/biod_client.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 #include "chromeos/dbus/power/power_policy_controller.h"
 #include "components/exo/file_helper.h"
@@ -73,7 +72,6 @@ ShellBrowserMainParts::~ShellBrowserMainParts() = default;
 void ShellBrowserMainParts::PreMainMessageLoopStart() {}
 
 void ShellBrowserMainParts::PostMainMessageLoopStart() {
-  chromeos::DBusThreadManager::Initialize(chromeos::DBusThreadManager::kShared);
   chromeos::PowerManagerClient::InitializeFake();
   chromeos::BiodClient::InitializeFake();
 

diff --git a/ash/shutdown_controller.cc b/ash/shutdown_controller.cc
@@ -13,7 +13,6 @@
 #include "base/metrics/user_metrics.h"
 #include "base/strings/stringprintf.h"
 #include "base/system/sys_info.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
@@ -42,7 +41,6 @@ void ShutdownController::ShutDownOrReboot(ShutdownReason reason) {
     base::RecordAction(base::UserMetricsAction("Accel_ShutDown_PowerButton"));
 
   // On real Chrome OS hardware the power manager handles shutdown.
-  using chromeos::DBusThreadManager;
   std::string description = base::StringPrintf("UI request from ash: %s",
                                                ShutdownReasonToString(reason));
   if (reboot_on_shutdown_) {

diff --git a/ash/system/audio/display_speaker_controller.cc b/ash/system/audio/display_speaker_controller.cc
@@ -6,7 +6,6 @@
 
 #include "ash/shell.h"
 #include "chromeos/audio/cras_audio_handler.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"

diff --git a/ash/system/brightness/brightness_controller_chromeos.cc b/ash/system/brightness/brightness_controller_chromeos.cc
@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "base/metrics/user_metrics.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 #include "chromeos/dbus/power_manager/backlight.pb.h"
 #include "ui/base/accelerators/accelerator.h"

diff --git a/ash/system/keyboard_brightness/keyboard_brightness_controller.cc b/ash/system/keyboard_brightness/keyboard_brightness_controller.cc
@@ -5,7 +5,6 @@
 #include "ash/system/keyboard_brightness/keyboard_brightness_controller.h"
 
 #include "base/metrics/user_metrics.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 #include "ui/base/accelerators/accelerator.h"
 

diff --git a/ash/system/network/auto_connect_notifier_unittest.cc b/ash/system/network/auto_connect_notifier_unittest.cc
@@ -13,7 +13,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/timer/mock_timer.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/shill/shill_clients.h"
 #include "chromeos/dbus/shill/shill_service_client.h"
 #include "chromeos/network/auto_connect_handler.h"
 #include "chromeos/network/network_cert_loader.h"
@@ -41,7 +41,7 @@ class AutoConnectNotifierTest : public AshTestBase {
   void SetUp() override {
     chromeos::NetworkCertLoader::Initialize();
     chromeos::NetworkCertLoader::ForceHardwareBackedForTesting();
-    chromeos::DBusThreadManager::Initialize();
+    chromeos::shill_clients::InitializeFakes();
     chromeos::NetworkHandler::Initialize();
     CHECK(chromeos::NetworkHandler::Get()->auto_connect_handler());
     AshTestBase::SetUp();
@@ -52,19 +52,17 @@ class AutoConnectNotifierTest : public AshTestBase {
         ->auto_connect_->set_timer_for_testing(
             base::WrapUnique(mock_notification_timer_));
 
-    chromeos::DBusThreadManager::Get()
-        ->GetShillServiceClient()
-        ->GetTestInterface()
-        ->AddService(kTestServicePath, kTestServiceGuid, kTestServiceName,
-                     shill::kTypeWifi, shill::kStateOnline, true /* visible*/);
+    chromeos::ShillServiceClient::Get()->GetTestInterface()->AddService(
+        kTestServicePath, kTestServiceGuid, kTestServiceName, shill::kTypeWifi,
+        shill::kStateOnline, true /* visible*/);
     // Ensure fake DBus service initialization completes.
     base::RunLoop().RunUntilIdle();
   }
 
   void TearDown() override {
     AshTestBase::TearDown();
     chromeos::NetworkHandler::Shutdown();
-    chromeos::DBusThreadManager::Shutdown();
+    chromeos::shill_clients::Shutdown();
     chromeos::NetworkCertLoader::Shutdown();
   }
 
@@ -76,7 +74,7 @@ class AutoConnectNotifierTest : public AshTestBase {
   }
 
   void SuccessfullyJoinWifiNetwork() {
-    chromeos::DBusThreadManager::Get()->GetShillServiceClient()->Connect(
+    chromeos::ShillServiceClient::Get()->Connect(
         dbus::ObjectPath(kTestServicePath), base::BindRepeating([]() {}),
         chromeos::ShillServiceClient::ErrorCallback());
     base::RunLoop().RunUntilIdle();

diff --git a/ash/system/network/wifi_toggle_notification_controller_unittest.cc b/ash/system/network/wifi_toggle_notification_controller_unittest.cc
@@ -7,7 +7,7 @@
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/test/ash_test_base.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/shill/shill_clients.h"
 #include "chromeos/network/network_handler.h"
 #include "components/prefs/testing_pref_service.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -24,7 +24,7 @@ class WifiToggleNotificationControllerTest : public AshTestBase {
 
   // testing::Test:
   void SetUp() override {
-    chromeos::DBusThreadManager::Initialize();
+    chromeos::shill_clients::InitializeFakes();
     // Initializing NetworkHandler before ash is more like production.
     chromeos::NetworkHandler::Initialize();
     AshTestBase::SetUp();
@@ -39,7 +39,7 @@ class WifiToggleNotificationControllerTest : public AshTestBase {
     chromeos::NetworkHandler::Get()->ShutdownPrefServices();
     AshTestBase::TearDown();
     chromeos::NetworkHandler::Shutdown();
-    chromeos::DBusThreadManager::Shutdown();
+    chromeos::shill_clients::Shutdown();
   }
 
  private:

diff --git a/ash/system/night_light/night_light_controller.cc b/ash/system/night_light/night_light_controller.cc
@@ -19,7 +19,6 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/numerics/ranges.h"
 #include "base/time/time.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "third_party/icu/source/i18n/astro.h"

diff --git a/ash/system/power/notification_reporter_unittest.cc b/ash/system/power/notification_reporter_unittest.cc
@@ -10,7 +10,6 @@
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power/fake_power_manager_client.h"
 #include "ui/message_center/fake_message_center.h"
 #include "ui/message_center/public/cpp/notification.h"

diff --git a/ash/system/power/peripheral_battery_notifier.cc b/ash/system/power/peripheral_battery_notifier.cc
@@ -17,7 +17,6 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "third_party/re2/src/re2/re2.h"

diff --git a/ash/system/power/power_button_controller.cc b/ash/system/power/power_button_controller.cc
@@ -28,7 +28,6 @@
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/time/default_tick_clock.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager/backlight.pb.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/views/widget/widget.h"

diff --git a/ash/system/power/power_button_display_controller.cc b/ash/system/power/power_button_display_controller.cc
@@ -10,7 +10,6 @@
 #include "ash/system/power/scoped_backlights_forced_off.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
 #include "base/time/tick_clock.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power/power_policy_controller.h"
 #include "ui/events/devices/input_device_manager.h"
 #include "ui/events/devices/stylus_state.h"

diff --git a/ash/system/power/power_event_observer.cc b/ash/system/power/power_event_observer.cc
@@ -19,7 +19,6 @@
 #include "base/location.h"
 #include "base/scoped_observer.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/user_activity/user_activity_detector.h"

diff --git a/ash/system/power/power_status.cc b/ash/system/power/power_status.cc
@@ -16,7 +16,6 @@
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"

diff --git a/ash/system/power/video_activity_notifier.cc b/ash/system/power/video_activity_notifier.cc
@@ -6,7 +6,6 @@
 
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 
 namespace ash {

diff --git a/ash/system/power/video_activity_notifier_unittest.cc b/ash/system/power/video_activity_notifier_unittest.cc
@@ -9,7 +9,6 @@
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/video_detector.h"
 #include "base/macros.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power/fake_power_manager_client.h"
 
 namespace ash {

diff --git a/ash/system/status_area_widget_unittest.cc b/ash/system/status_area_widget_unittest.cc
@@ -21,7 +21,7 @@
 #include "ash/test/ash_test_base.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/shill/shill_clients.h"
 #include "chromeos/network/network_handler.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/session_manager/session_manager_types.h"
@@ -217,7 +217,7 @@ class UnifiedStatusAreaWidgetTest : public AshTestBase {
 
   // AshTestBase:
   void SetUp() override {
-    chromeos::DBusThreadManager::Initialize();
+    chromeos::shill_clients::InitializeFakes();
     // Initializing NetworkHandler before ash is more like production.
     chromeos::NetworkHandler::Initialize();
     AshTestBase::SetUp();
@@ -232,7 +232,7 @@ class UnifiedStatusAreaWidgetTest : public AshTestBase {
     chromeos::NetworkHandler::Get()->ShutdownPrefServices();
     AshTestBase::TearDown();
     chromeos::NetworkHandler::Shutdown();
-    chromeos::DBusThreadManager::Shutdown();
+    chromeos::shill_clients::Shutdown();
   }
 
  private:

diff --git a/ash/system/unified/unified_system_tray_controller_unittest.cc b/ash/system/unified/unified_system_tray_controller_unittest.cc
@@ -13,7 +13,7 @@
 #include "ash/system/unified/unified_system_tray_model.h"
 #include "ash/system/unified/unified_system_tray_view.h"
 #include "ash/test/ash_test_base.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/shill/shill_clients.h"
 #include "chromeos/network/network_handler.h"
 #include "components/prefs/testing_pref_service.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
@@ -41,7 +41,7 @@ class UnifiedSystemTrayControllerTest : public AshTestBase,
 
   // testing::Test:
   void SetUp() override {
-    chromeos::DBusThreadManager::Initialize();
+    chromeos::shill_clients::InitializeFakes();
     // Initializing NetworkHandler before ash is more like production.
     chromeos::NetworkHandler::Initialize();
     AshTestBase::SetUp();
@@ -67,7 +67,7 @@ class UnifiedSystemTrayControllerTest : public AshTestBase,
     chromeos::NetworkHandler::Get()->ShutdownPrefServices();
     AshTestBase::TearDown();
     chromeos::NetworkHandler::Shutdown();
-    chromeos::DBusThreadManager::Shutdown();
+    chromeos::shill_clients::Shutdown();
   }
 
   // views::ViewObserver:

diff --git a/ash/system/unified/unified_system_tray_model.cc b/ash/system/unified/unified_system_tray_model.cc
@@ -8,7 +8,6 @@
 #include "ash/shell.h"
 #include "ash/system/brightness_control_delegate.h"
 #include "base/bind.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager/backlight.pb.h"
 
 namespace ash {