Skip to content

GitLab

T
tangled
Commit 3774d66c authored by Quan Nguyen's avatar Quan Nguyen Committed by Commit Bot
Browse files
Options

cros: Rename LoginTestBase::data_dispatcher to DataDispatcher 

This puts the method name more in line with Google C++ style, since snake_case
should only be used with simple getters.

Bug: 906676
Change-Id: I045aa7c8ac641b37854b38cf0934890ebbd88ca0
Reviewed-on: https://chromium-review.googlesource.com/c/1343250Reviewed-by: default avatarJacob Dufault <jdufault@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Quan Nguyen <qnnguyen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609491}
parent 73b9579d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 148 additions and 150 deletions
ash/login/ui/lock_contents_view_unittest.cc
View file @ 3774d66c
This diff is collapsed.
ash/login/ui/lock_screen_sanity_unittest.cc
View file @ 3774d66c
......@@ -75,8 +75,8 @@ TEST_F(LockScreenSanityTest, PasswordIsInitiallyFocused) {
// Build lock screen.
auto* contents = new LockContentsView(
mojom::TrayActionState::kNotAvailable, LockScreen::ScreenType::kLock,
data_dispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(data_dispatcher()));
DataDispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(DataDispatcher()));
// The lock screen requires at least one user.
SetUserCount(1);
......@@ -94,8 +94,8 @@ TEST_F(LockScreenSanityTest, PasswordSubmitCallsLoginScreenClient) {
// Build lock screen.
auto* contents = new LockContentsView(
mojom::TrayActionState::kNotAvailable, LockScreen::ScreenType::kLock,
data_dispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(data_dispatcher()));
DataDispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(DataDispatcher()));
// The lock screen requires at least one user.
SetUserCount(1);
......@@ -122,8 +122,8 @@ TEST_F(LockScreenSanityTest,
auto* contents = new LockContentsView(
mojom::TrayActionState::kAvailable, LockScreen::ScreenType::kLock,
data_dispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(data_dispatcher()));
DataDispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(DataDispatcher()));
SetUserCount(1);
std::unique_ptr<views::Widget> widget = CreateWidgetWithContent(contents);
LoginPasswordView::TestApi password_test_api =
......@@ -179,8 +179,8 @@ TEST_F(LockScreenSanityTest, TabGoesFromLockToShelfAndBackToLock) {
// Create lock screen.
auto* lock = new LockContentsView(
mojom::TrayActionState::kNotAvailable, LockScreen::ScreenType::kLock,
data_dispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(data_dispatcher()));
DataDispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(DataDispatcher()));
SetUserCount(1);
std::unique_ptr<views::Widget> widget = CreateWidgetWithContent(lock);
views::View* shelf = Shelf::ForWindow(lock->GetWidget()->GetNativeWindow())
......@@ -212,8 +212,8 @@ TEST_F(LockScreenSanityTest, ShiftTabGoesFromLockToStatusAreaAndBackToLock) {
auto* lock = new LockContentsView(
mojom::TrayActionState::kNotAvailable, LockScreen::ScreenType::kLock,
data_dispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(data_dispatcher()));
DataDispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(DataDispatcher()));
SetUserCount(1);
std::unique_ptr<views::Widget> widget = CreateWidgetWithContent(lock);
views::View* status_area =
......@@ -243,8 +243,8 @@ TEST_F(LockScreenSanityTest, TabWithLockScreenAppActive) {
auto* lock = new LockContentsView(
mojom::TrayActionState::kNotAvailable, LockScreen::ScreenType::kLock,
data_dispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(data_dispatcher()));
DataDispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(DataDispatcher()));
SetUserCount(1);
std::unique_ptr<views::Widget> widget = CreateWidgetWithContent(lock);
......@@ -260,7 +260,7 @@ TEST_F(LockScreenSanityTest, TabWithLockScreenAppActive) {
LoginScreenController* controller = Shell::Get()->login_screen_controller();
// Initialize lock screen action state.
data_dispatcher()->SetLockScreenNoteState(mojom::TrayActionState::kActive);
DataDispatcher()->SetLockScreenNoteState(mojom::TrayActionState::kActive);
// Create and focus a lock screen app window.
auto* lock_screen_app = new views::View();
......@@ -315,8 +315,8 @@ TEST_F(LockScreenSanityTest, FocusLockScreenWhenLockScreenAppExit) {
session_manager::SessionState::LOCKED);
auto* lock = new LockContentsView(
mojom::TrayActionState::kNotAvailable, LockScreen::ScreenType::kLock,
data_dispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(data_dispatcher()));
DataDispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(DataDispatcher()));
SetUserCount(1);
std::unique_ptr<views::Widget> widget = CreateWidgetWithContent(lock);
......@@ -325,7 +325,7 @@ TEST_F(LockScreenSanityTest, FocusLockScreenWhenLockScreenAppExit) {
->GetContentsView();
// Setup and focus a lock screen app.
data_dispatcher()->SetLockScreenNoteState(mojom::TrayActionState::kActive);
DataDispatcher()->SetLockScreenNoteState(mojom::TrayActionState::kActive);
auto* lock_screen_app = new views::View();
lock_screen_app->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
std::unique_ptr<views::Widget> app_widget =
......@@ -340,7 +340,7 @@ TEST_F(LockScreenSanityTest, FocusLockScreenWhenLockScreenAppExit) {
// Move the lock screen note taking to available state (which happens when the
// app session ends) - this should focus the lock screen.
data_dispatcher()->SetLockScreenNoteState(mojom::TrayActionState::kAvailable);
DataDispatcher()->SetLockScreenNoteState(mojom::TrayActionState::kAvailable);
EXPECT_TRUE(VerifyFocused(lock));
// Tab through the lock screen - the focus should eventually get to the shelf.
......@@ -355,14 +355,14 @@ TEST_F(LockScreenSanityTest, RemoveUser) {
auto* contents = new LockContentsView(
mojom::TrayActionState::kAvailable, LockScreen::ScreenType::kLock,
data_dispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(data_dispatcher()));
DataDispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(DataDispatcher()));
// Add two users, the first of which can be removed.
users().push_back(CreateUser("test1@test"));
users()[0]->can_remove = true;
users().push_back(CreateUser("test2@test"));
data_dispatcher()->NotifyUsers(users());
DataDispatcher()->NotifyUsers(users());
std::unique_ptr<views::Widget> widget = CreateWidgetWithContent(contents);
......
ash/login/ui/login_test_base.cc
View file @ 3774d66c
......@@ -110,7 +110,7 @@ void LoginTestBase::SetUserCount(size_t count) {
users_.erase(users_.begin() + count, users_.end());
// Notify any listeners that the user count has changed.
data_dispatcher()->NotifyUsers(users_);
DataDispatcher()->NotifyUsers(users_);
}
void LoginTestBase::AddUsers(size_t num_users) {
......@@ -121,12 +121,12 @@ void LoginTestBase::AddUsers(size_t num_users) {
}
// Notify any listeners that the user count has changed.
data_dispatcher()->NotifyUsers(users_);
DataDispatcher()->NotifyUsers(users_);
}
void LoginTestBase::AddUserByEmail(const std::string& email) {
users_.push_back(CreateUser(email));
data_dispatcher()->NotifyUsers(users_);
DataDispatcher()->NotifyUsers(users_);
}
void LoginTestBase::AddPublicAccountUsers(size_t num_public_accounts) {
......@@ -137,10 +137,10 @@ void LoginTestBase::AddPublicAccountUsers(size_t num_public_accounts) {
}
// Notify any listeners that the user count has changed.
data_dispatcher()->NotifyUsers(users_);
DataDispatcher()->NotifyUsers(users_);
}
LoginDataDispatcher* LoginTestBase::data_dispatcher() {
LoginDataDispatcher* LoginTestBase::DataDispatcher() {
return LockScreen::HasInstance() ? LockScreen::Get()->data_dispatcher()
: &data_dispatcher_;
}
......
ash/login/ui/login_test_base.h
View file @ 3774d66c
......@@ -44,12 +44,12 @@ class LoginTestBase : public AshTestBase {
// shown.
std::unique_ptr<views::Widget> CreateWidgetWithContent(views::View* content);
// Changes the active number of users. Fires an event on |data_dispatcher()|.
// Changes the active number of users. Fires an event on |DataDispatcher()|.
void SetUserCount(size_t count);
// Append number of |num_users| regular auth users.
// Changes the active number of users. Fires an event on
// |data_dispatcher()|.
// |DataDispatcher()|.
void AddUsers(size_t num_users);
// Add a single user with the specified |email|.
......@@ -57,7 +57,7 @@ class LoginTestBase : public AshTestBase {
// Append number of |num_public_accounts| public account users.
// Changes the active number of users. Fires an event on
// |data_dispatcher()|.
// |DataDispatcher()|.
void AddPublicAccountUsers(size_t num_public_accounts);
std::vector<mojom::LoginUserInfoPtr>& users() { return users_; }
......@@ -66,8 +66,7 @@ class LoginTestBase : public AshTestBase {
// If the LockScreen is instantiated, returns its data dispatcher. Otherwise,
// returns a standalone instance.
// TODO(crbug/906676): rename this method to DataDispatcher.
LoginDataDispatcher* data_dispatcher();
LoginDataDispatcher* DataDispatcher();
// AshTestBase:
void TearDown() override;
......
ash/metrics/login_metrics_recorder_unittest.cc
View file @ 3774d66c
......@@ -85,8 +85,8 @@ TEST_F(LoginMetricsRecorderTest, NoteActionButtonClick) {
auto* contents = new LockContentsView(
mojom::TrayActionState::kAvailable, LockScreen::ScreenType::kLock,
data_dispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(data_dispatcher()));
DataDispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(DataDispatcher()));
SetUserCount(1);
std::unique_ptr<views::Widget> widget = CreateWidgetWithContent(contents);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment