Correct the activation of idle time spell checker on document attach

third_party/WebKit/Source/core/editing/spellcheck/IdleSpellCheckCallbackTest.cpp

Index: third_party/WebKit/Source/core/editing/spellcheck/IdleSpellCheckCallbackTest.cpp
diff --git a/third_party/WebKit/Source/core/editing/spellcheck/IdleSpellCheckCallbackTest.cpp b/third_party/WebKit/Source/core/editing/spellcheck/IdleSpellCheckCallbackTest.cpp
index c6ed9fc996c25dde236f6d7b9e4c4ae9593a5de1..918dfd089cd6d2e1a0fa368df36aad1fe0226211 100644
--- a/third_party/WebKit/Source/core/editing/spellcheck/IdleSpellCheckCallbackTest.cpp
+++ b/third_party/WebKit/Source/core/editing/spellcheck/IdleSpellCheckCallbackTest.cpp
@@ -19,12 +19,6 @@ class IdleSpellCheckCallbackTest : public SpellCheckTestBase {
     return frame().spellChecker().idleSpellCheckCallback();
   }
 
-  void SetUp() override {
-    SpellCheckTestBase::SetUp();
-    if (!RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
-      idleChecker().documentAttached(frame().document());
-  }
-
   void transitTo(State state) {
     switch (state) {
       case State::kInactive:
@@ -48,10 +42,16 @@ class IdleSpellCheckCallbackTest : public SpellCheckTestBase {
 // Test cases for lifecycle state transitions.
 
 TEST_F(IdleSpellCheckCallbackTest, Initialization) {
+  if (!RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
+    return;
+
   EXPECT_EQ(State::kColdModeTimerStarted, idleChecker().state());
 }
 
 TEST_F(IdleSpellCheckCallbackTest, RequestWhenInactive) {
+  if (!RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
+    return;
+
   transitTo(State::kInactive);
   idleChecker().setNeedsInvocation();
   EXPECT_EQ(State::kHotModeRequested, idleChecker().state());
@@ -59,6 +59,9 @@ TEST_F(IdleSpellCheckCallbackTest, RequestWhenInactive) {
 }
 
 TEST_F(IdleSpellCheckCallbackTest, RequestWhenHotModeRequested) {
+  if (!RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
+    return;
+
   transitTo(State::kHotModeRequested);
   int handle = idleChecker().idleCallbackHandle();
   idleChecker().setNeedsInvocation();
@@ -68,6 +71,9 @@ TEST_F(IdleSpellCheckCallbackTest, RequestWhenHotModeRequested) {
 }
 
 TEST_F(IdleSpellCheckCallbackTest, RequestWhenColdModeTimerStarted) {
+  if (!RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
+    return;
+
   transitTo(State::kColdModeTimerStarted);
   idleChecker().setNeedsInvocation();
   EXPECT_EQ(State::kHotModeRequested, idleChecker().state());
@@ -75,6 +81,9 @@ TEST_F(IdleSpellCheckCallbackTest, RequestWhenColdModeTimerStarted) {
 }
 
 TEST_F(IdleSpellCheckCallbackTest, RequestWhenColdModeRequested) {
+  if (!RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
+    return;
+
   transitTo(State::kColdModeRequested);
   int handle = idleChecker().idleCallbackHandle();
   idleChecker().setNeedsInvocation();
@@ -84,12 +93,18 @@ TEST_F(IdleSpellCheckCallbackTest, RequestWhenColdModeRequested) {
 }
 
 TEST_F(IdleSpellCheckCallbackTest, HotModeTransitToColdMode) {
+  if (!RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
+    return;
+
   transitTo(State::kHotModeRequested);
   idleChecker().forceInvocationForTesting();
   EXPECT_EQ(State::kColdModeTimerStarted, idleChecker().state());
 }
 
 TEST_F(IdleSpellCheckCallbackTest, ColdModeTimerStartedToRequested) {
+  if (!RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
+    return;
+
   transitTo(State::kColdModeTimerStarted);
   idleChecker().skipColdModeTimerForTesting();
   EXPECT_EQ(State::kColdModeRequested, idleChecker().state());
@@ -97,6 +112,9 @@ TEST_F(IdleSpellCheckCallbackTest, ColdModeTimerStartedToRequested) {
 }
 
 TEST_F(IdleSpellCheckCallbackTest, ColdModeStayAtColdMode) {
+  if (!RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
+    return;
+
   transitTo(State::kColdModeRequested);
   idleChecker().setNeedsMoreColdModeInvocationForTesting();
   idleChecker().forceInvocationForTesting();
@@ -104,30 +122,45 @@ TEST_F(IdleSpellCheckCallbackTest, ColdModeStayAtColdMode) {
 }
 
 TEST_F(IdleSpellCheckCallbackTest, ColdModeToInactive) {
+  if (!RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
+    return;
+
   transitTo(State::kColdModeRequested);
   idleChecker().forceInvocationForTesting();
   EXPECT_EQ(State::kInactive, idleChecker().state());
 }
 
 TEST_F(IdleSpellCheckCallbackTest, DetachWhenInactive) {
+  if (!RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
+    return;
+
   transitTo(State::kInactive);
   document().shutdown();
   EXPECT_EQ(State::kInactive, idleChecker().state());
 }
 
 TEST_F(IdleSpellCheckCallbackTest, DetachWhenHotModeRequested) {
+  if (!RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
+    return;
+
   transitTo(State::kHotModeRequested);
   document().shutdown();
   EXPECT_EQ(State::kInactive, idleChecker().state());
 }
 
 TEST_F(IdleSpellCheckCallbackTest, DetachWhenColdModeTimerStarted) {
+  if (!RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
+    return;
+
   transitTo(State::kColdModeTimerStarted);
   document().shutdown();
   EXPECT_EQ(State::kInactive, idleChecker().state());
 }
 
 TEST_F(IdleSpellCheckCallbackTest, DetachWhenColdModeRequested) {
+  if (!RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
+    return;
+
   transitTo(State::kColdModeRequested);
   document().shutdown();
   EXPECT_EQ(State::kInactive, idleChecker().state());