Commit d1c99618 authored by Xiaocheng Hu's avatar Xiaocheng Hu Committed by Commit Bot

Remove cold mode idle time spellchecker flag

As cold mode idle time spellchecker is shipped into M68
and no regression is obversed, this patch removes the flag
from M69 as cleanup.

Bug: 716642
Change-Id: I8f850c52469590ee9d5e542c14f4dae842a6163a
Reviewed-on: https://chromium-review.googlesource.com/1072953Reviewed-by: default avatarKent Tamura <tkent@chromium.org>
Reviewed-by: default avatarYoshifumi Inoue <yosin@chromium.org>
Commit-Queue: Xiaocheng Hu <xiaochengh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561951}
parent 40f7d75b
......@@ -106,8 +106,7 @@ void IdleSpellCheckCallback::SetNeedsInvocation() {
}
void IdleSpellCheckCallback::SetNeedsColdModeInvocation() {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled() ||
!IsSpellCheckingEnabled()) {
if (!IsSpellCheckingEnabled()) {
Deactivate();
return;
}
......@@ -125,7 +124,6 @@ void IdleSpellCheckCallback::SetNeedsColdModeInvocation() {
}
void IdleSpellCheckCallback::ColdModeTimerFired(TimerBase*) {
DCHECK(RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled());
DCHECK_EQ(State::kColdModeTimerStarted, state_);
if (!IsSpellCheckingEnabled() || !IsAvailable()) {
......@@ -181,7 +179,6 @@ void IdleSpellCheckCallback::invoke(IdleDeadline* deadline) {
HotModeInvocation(deadline);
SetNeedsColdModeInvocation();
} else if (state_ == State::kColdModeRequested) {
DCHECK(RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled());
state_ = State::kInColdModeInvocation;
cold_mode_requester_->Invoke(deadline);
if (cold_mode_requester_->FullyChecked())
......
......@@ -37,10 +37,8 @@ class IdleSpellCheckCallbackTest : public SpellCheckTestBase {
IdleChecker().SetNeedsInvocation();
break;
case State::kColdModeTimerStarted:
DCHECK(RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled());
break;
case State::kColdModeRequested:
DCHECK(RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled());
IdleChecker().SkipColdModeTimerForTesting();
break;
case State::kInHotModeInvocation:
......@@ -53,19 +51,9 @@ class IdleSpellCheckCallbackTest : public SpellCheckTestBase {
// Test cases for lifecycle state transitions.
TEST_F(IdleSpellCheckCallbackTest, InitializationWithColdMode) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
EXPECT_EQ(State::kColdModeTimerStarted, IdleChecker().GetState());
}
TEST_F(IdleSpellCheckCallbackTest, InitializationWithoutColdMode) {
if (RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
EXPECT_EQ(State::kInactive, IdleChecker().GetState());
}
TEST_F(IdleSpellCheckCallbackTest, RequestWhenInactive) {
TransitTo(State::kInactive);
IdleChecker().SetNeedsInvocation();
......@@ -83,9 +71,6 @@ TEST_F(IdleSpellCheckCallbackTest, RequestWhenHotModeRequested) {
}
TEST_F(IdleSpellCheckCallbackTest, RequestWhenColdModeTimerStarted) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kColdModeTimerStarted);
IdleChecker().SetNeedsInvocation();
EXPECT_EQ(State::kHotModeRequested, IdleChecker().GetState());
......@@ -93,9 +78,6 @@ TEST_F(IdleSpellCheckCallbackTest, RequestWhenColdModeTimerStarted) {
}
TEST_F(IdleSpellCheckCallbackTest, RequestWhenColdModeRequested) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kColdModeRequested);
int handle = IdleChecker().IdleCallbackHandle();
IdleChecker().SetNeedsInvocation();
......@@ -104,28 +86,13 @@ TEST_F(IdleSpellCheckCallbackTest, RequestWhenColdModeRequested) {
EXPECT_NE(-1, IdleChecker().IdleCallbackHandle());
}
TEST_F(IdleSpellCheckCallbackTest, HotModeTransitToInactive) {
if (RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kHotModeRequested);
IdleChecker().ForceInvocationForTesting();
EXPECT_EQ(State::kInactive, IdleChecker().GetState());
}
TEST_F(IdleSpellCheckCallbackTest, HotModeTransitToColdMode) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kHotModeRequested);
IdleChecker().ForceInvocationForTesting();
EXPECT_EQ(State::kColdModeTimerStarted, IdleChecker().GetState());
}
TEST_F(IdleSpellCheckCallbackTest, ColdModeTimerStartedToRequested) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kColdModeTimerStarted);
IdleChecker().SkipColdModeTimerForTesting();
EXPECT_EQ(State::kColdModeRequested, IdleChecker().GetState());
......@@ -133,9 +100,6 @@ TEST_F(IdleSpellCheckCallbackTest, ColdModeTimerStartedToRequested) {
}
TEST_F(IdleSpellCheckCallbackTest, ColdModeStayAtColdMode) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kColdModeRequested);
IdleChecker().SetNeedsMoreColdModeInvocationForTesting();
IdleChecker().ForceInvocationForTesting();
......@@ -143,9 +107,6 @@ TEST_F(IdleSpellCheckCallbackTest, ColdModeStayAtColdMode) {
}
TEST_F(IdleSpellCheckCallbackTest, ColdModeToInactive) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kColdModeRequested);
IdleChecker().ForceInvocationForTesting();
EXPECT_EQ(State::kInactive, IdleChecker().GetState());
......@@ -164,18 +125,12 @@ TEST_F(IdleSpellCheckCallbackTest, DetachWhenHotModeRequested) {
}
TEST_F(IdleSpellCheckCallbackTest, DetachWhenColdModeTimerStarted) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kColdModeTimerStarted);
GetDocument().Shutdown();
EXPECT_EQ(State::kInactive, IdleChecker().GetState());
}
TEST_F(IdleSpellCheckCallbackTest, DetachWhenColdModeRequested) {
if (!RuntimeEnabledFeatures::IdleTimeColdModeSpellCheckingEnabled())
return;
TransitTo(State::kColdModeRequested);
GetDocument().Shutdown();
EXPECT_EQ(State::kInactive, IdleChecker().GetState());
......
......@@ -586,10 +586,6 @@
name: "IDBObserver",
status: "experimental",
},
{
name: "IdleTimeColdModeSpellChecking",
status: "stable",
},
{
name: "ImageDecodingAttribute",
status: "stable",
......
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