Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(513)

Unified Diff: ash/wm/lock_state_controller_unittest.cc

Issue 2497123002: chromeos: Move device shutdown handling out of chrome into ash (Closed)
Patch Set: rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/lock_state_controller.cc ('k') | ash/wm/shutdown_client_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/lock_state_controller_unittest.cc
diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc
index 26479526f7cb47a91c229ddf6857001830761913..5a9f1bfb8e29d4c8161e15ef25c24eb80777bfce 100644
--- a/ash/wm/lock_state_controller_unittest.cc
+++ b/ash/wm/lock_state_controller_unittest.cc
@@ -8,6 +8,7 @@
#include <utility>
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shutdown_controller.h"
#include "ash/common/test/test_session_state_delegate.h"
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
@@ -17,7 +18,6 @@
#include "ash/test/test_screenshot_delegate.h"
#include "ash/test/test_session_state_animator.h"
#include "ash/test/test_shell_delegate.h"
-#include "ash/test/test_shutdown_client.h"
#include "ash/wm/power_button_controller.h"
#include "ash/wm/session_state_animator.h"
#include "base/memory/scoped_vector.h"
@@ -43,6 +43,23 @@ void CheckCalledCallback(bool* flag) {
(*flag) = true;
}
+// ShutdownController that tracks how many shutdown requests have been made.
+class TestShutdownController : public ShutdownController {
+ public:
+ TestShutdownController() {}
+ ~TestShutdownController() override {}
+
+ int num_shutdown_requests() const { return num_shutdown_requests_; }
+
+ private:
+ // ShutdownController:
+ void ShutDownOrReboot() override { num_shutdown_requests_++; }
+
+ int num_shutdown_requests_ = 0;
+
+ DISALLOW_COPY_AND_ASSIGN(TestShutdownController);
+};
+
} // namespace
class LockStateControllerTest : public AshTestBase {
@@ -50,7 +67,6 @@ class LockStateControllerTest : public AshTestBase {
LockStateControllerTest()
: power_button_controller_(nullptr),
lock_state_controller_(nullptr),
- shutdown_client_(nullptr),
session_manager_client_(nullptr),
test_animator_(nullptr) {}
~LockStateControllerTest() override {}
@@ -61,16 +77,13 @@ class LockStateControllerTest : public AshTestBase {
base::WrapUnique(session_manager_client_));
AshTestBase::SetUp();
- shutdown_client_ = new TestShutdownClient;
- std::unique_ptr<TestShutdownClient> shutdown_client(shutdown_client_);
-
test_animator_ = new TestSessionStateAnimator;
lock_state_controller_ = Shell::GetInstance()->lock_state_controller();
lock_state_controller_->set_animator_for_test(test_animator_);
test_api_.reset(new LockStateControllerTestApi(lock_state_controller_));
- test_api_->SetShutdownClient(std::move(shutdown_client));
+ test_api_->set_shutdown_controller(&test_shutdown_controller_);
power_button_controller_ = Shell::GetInstance()->power_button_controller();
@@ -90,7 +103,7 @@ class LockStateControllerTest : public AshTestBase {
}
int NumShutdownRequests() {
- return shutdown_client_->num_shutdown_requests() +
+ return test_shutdown_controller_.num_shutdown_requests() +
shell_delegate_->num_exit_requests();
}
@@ -327,7 +340,7 @@ class LockStateControllerTest : public AshTestBase {
PowerButtonController* power_button_controller_; // not owned
LockStateController* lock_state_controller_; // not owned
- TestShutdownClient* shutdown_client_; // not owned
+ TestShutdownController test_shutdown_controller_;
// Ownership is passed on to chromeos::DBusThreadManager.
chromeos::FakeSessionManagerClient* session_manager_client_;
TestSessionStateAnimator* test_animator_; // not owned
« no previous file with comments | « ash/wm/lock_state_controller.cc ('k') | ash/wm/shutdown_client_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698