cros: remove dup DBusThreadManager::Shutdown

Changes: For DBusThreadManager::Shutdown in ash_unittests: - Mash, it is done by window_manager_service_ in AshTestHelper. - Cash, it is done internally in AshTestHelper. This CL removes all dup calls in ash_unittests. Bug: none Test: trybot tests Change-Id: Ic039e11579faa8eff6aab9f924f051d62aabab5b Reviewed-on: https://chromium-review.googlesource.com/856177 Commit-Queue: Qiang(Joe) Xu <warx@chromium.org> Reviewed-by: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#528181}
Denger-Network · Jan 10, 2018 · abb23bf · abb23bf
1 parent 488905f
commit abb23bf
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 13 deletions.
diff --git a/ash/lock_screen_action/lock_screen_note_display_state_handler_unittest.cc b/ash/lock_screen_action/lock_screen_note_display_state_handler_unittest.cc
@@ -117,7 +117,6 @@ class LockScreenNoteDisplayStateHandlerTest : public AshTestBase {
   void TearDown() override {
     AshTestBase::TearDown();
     power_manager_observer_.reset();
-    chromeos::DBusThreadManager::Shutdown();
   }
 
   bool LaunchTimeoutRunning() {

diff --git a/ash/system/network/tray_network_unittest.cc b/ash/system/network/tray_network_unittest.cc
@@ -50,7 +50,6 @@ class TrayNetworkTest : public AshTestBase {
     }
     AshTestBase::TearDown();
     chromeos::NetworkHandler::Shutdown();
-    chromeos::DBusThreadManager::Shutdown();
   }
 
  private:

diff --git a/ash/system/power/backlights_forced_off_setter_unittest.cc b/ash/system/power/backlights_forced_off_setter_unittest.cc
@@ -79,7 +79,6 @@ class BacklightsForcedOffSetterTest : public AshTestBase {
     backlights_forced_off_observer_.reset();
     backlights_forced_off_setter_.reset();
     AshTestBase::TearDown();
-    chromeos::DBusThreadManager::Shutdown();
   }
 
   void ResetBacklightsForcedOffSetter() {

diff --git a/ash/system/power/power_button_test_base.cc b/ash/system/power/power_button_test_base.cc
@@ -5,7 +5,6 @@
 #include "ash/system/power/power_button_test_base.h"
 
 #include "ash/public/cpp/ash_switches.h"
-#include "ash/public/cpp/config.h"
 #include "ash/session/session_controller.h"
 #include "ash/session/test_session_controller_client.h"
 #include "ash/shell.h"
@@ -56,14 +55,6 @@ void PowerButtonTestBase::SetUp() {
       std::make_unique<LockStateControllerTestApi>(lock_state_controller_);
 }
 
-void PowerButtonTestBase::TearDown() {
-  const Config config = Shell::GetAshConfig();
-  AshTestBase::TearDown();
-  // Mash/mus shuts down dbus after each test.
-  if (config == Config::CLASSIC)
-    chromeos::DBusThreadManager::Shutdown();
-}
-
 void PowerButtonTestBase::ResetPowerButtonController() {
   ShellTestApi().ResetPowerButtonControllerForTest();
   InitPowerButtonControllerMembers(false /* send_accelerometer_update */);

diff --git a/ash/system/power/power_button_test_base.h b/ash/system/power/power_button_test_base.h
@@ -55,7 +55,6 @@ class PowerButtonTestBase : public AshTestBase {
 
   // AshTestBase:
   void SetUp() override;
-  void TearDown() override;
 
  protected:
   // Resets the PowerButtonController and associated members.