Commit 64c97e47 authored by Mustaq Ahmed's avatar Mustaq Ahmed Committed by Commit Bot

[CodeHealth] Remove an unused method from UserActivationState.

Change-Id: I8a928600f226b452abd8c0747f6baf123ed10a5e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2437742
Commit-Queue: Mustaq Ahmed <mustaq@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812246}
parent 56c6c44a
......@@ -47,15 +47,6 @@ bool UserActivationState::ConsumeIfActive() {
return true;
}
void UserActivationState::TransferFrom(UserActivationState& other) {
if (other.has_been_active_)
has_been_active_ = true;
if (transient_state_expiry_time_ < other.transient_state_expiry_time_)
transient_state_expiry_time_ = other.transient_state_expiry_time_;
other.Clear();
}
void UserActivationState::ActivateTransientState() {
transient_state_expiry_time_ = base::TimeTicks::Now() + kActivationLifespan;
}
......
......@@ -127,108 +127,4 @@ TEST_F(UserActivationStateTest, ConsumptionPlusExpirationTest) {
EXPECT_TRUE(user_activation_state.ConsumeIfActive());
}
TEST_F(UserActivationStateTest, TransferBooleanTest) {
UserActivationState source;
UserActivationState target;
// Transfer from inactive source to inactive target.
source.Clear();
target.Clear();
target.TransferFrom(source);
EXPECT_FALSE(source.HasBeenActive());
EXPECT_FALSE(source.IsActive());
EXPECT_FALSE(target.HasBeenActive());
EXPECT_FALSE(target.IsActive());
// Transfer from inactive source to active target.
source.Clear();
target.Activate(mojom::blink::UserActivationNotificationType::kTest);
target.TransferFrom(source);
EXPECT_FALSE(source.HasBeenActive());
EXPECT_FALSE(source.IsActive());
EXPECT_TRUE(target.HasBeenActive());
EXPECT_TRUE(target.IsActive());
// Transfer from active source to inactive target.
source.Activate(mojom::blink::UserActivationNotificationType::kTest);
target.Clear();
target.TransferFrom(source);
EXPECT_FALSE(source.HasBeenActive());
EXPECT_FALSE(source.IsActive());
EXPECT_TRUE(target.HasBeenActive());
EXPECT_TRUE(target.IsActive());
// Transfer from active source to active target.
source.Activate(mojom::blink::UserActivationNotificationType::kTest);
target.Activate(mojom::blink::UserActivationNotificationType::kTest);
target.TransferFrom(source);
EXPECT_FALSE(source.HasBeenActive());
EXPECT_FALSE(source.IsActive());
EXPECT_TRUE(target.HasBeenActive());
EXPECT_TRUE(target.IsActive());
}
TEST_F(UserActivationStateTest, TransferExpirationTest) {
UserActivationState source;
UserActivationState target;
// Source activated before target.
source.Activate(mojom::blink::UserActivationNotificationType::kTest);
AdvanceClock(base::TimeDelta::FromSeconds(1));
target.Activate(mojom::blink::UserActivationNotificationType::kTest);
target.TransferFrom(source);
AdvanceClock(base::TimeDelta::FromMilliseconds(4995));
EXPECT_TRUE(target.IsActive());
AdvanceClock(base::TimeDelta::FromMilliseconds(10));
EXPECT_FALSE(target.IsActive());
// Source activated after target.
target.Activate(mojom::blink::UserActivationNotificationType::kTest);
AdvanceClock(base::TimeDelta::FromSeconds(1));
source.Activate(mojom::blink::UserActivationNotificationType::kTest);
target.TransferFrom(source);
AdvanceClock(base::TimeDelta::FromMilliseconds(4995));
EXPECT_TRUE(target.IsActive());
AdvanceClock(base::TimeDelta::FromMilliseconds(10));
EXPECT_FALSE(target.IsActive());
// Source and target activated at the same time.
source.Activate(mojom::blink::UserActivationNotificationType::kTest);
target.Activate(mojom::blink::UserActivationNotificationType::kTest);
target.TransferFrom(source);
AdvanceClock(base::TimeDelta::FromMilliseconds(4995));
EXPECT_TRUE(target.IsActive());
AdvanceClock(base::TimeDelta::FromMilliseconds(10));
EXPECT_FALSE(target.IsActive());
// Inactive target received transfer from active source after a delay.
source.Activate(mojom::blink::UserActivationNotificationType::kTest);
target.Clear();
AdvanceClock(base::TimeDelta::FromSeconds(1));
target.TransferFrom(source);
AdvanceClock(base::TimeDelta::FromMilliseconds(3995));
EXPECT_TRUE(target.IsActive());
AdvanceClock(base::TimeDelta::FromMilliseconds(10));
EXPECT_FALSE(target.IsActive());
// Active target received transfer from inactive source after a delay.
source.Clear();
target.Activate(mojom::blink::UserActivationNotificationType::kTest);
AdvanceClock(base::TimeDelta::FromSeconds(1));
target.TransferFrom(source);
AdvanceClock(base::TimeDelta::FromMilliseconds(3995));
EXPECT_TRUE(target.IsActive());
AdvanceClock(base::TimeDelta::FromMilliseconds(10));
EXPECT_FALSE(target.IsActive());
}
} // namespace blink
......@@ -110,13 +110,6 @@ class BLINK_COMMON_EXPORT UserActivationState {
// successfully consumed.
bool ConsumeIfActive();
// Transfers user activation state from |other| into |this|:
// - The sticky bit in |this| gets set if the bit in |other| is set.
// - The transient expiry time in |this| becomes the max of the expiry times
// in |this| and |other|.
// - The state in |other| is cleared.
void TransferFrom(UserActivationState& other);
private:
void ActivateTransientState();
void DeactivateTransientState();
......
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