Revert removal of grammar checking and marking code

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 5271 matching lines @@
     void kickNoResults()
     {
         kick(-1, -1, WebTextDecorationTypeSpelling);
     }
 
     void kick()
     {
         kick(1, 8, WebTextDecorationTypeSpelling);
     }
 
+    void kickGrammar()
+    {
+        kick(1, 8, WebTextDecorationTypeGrammar);
+    }
+
     void kickInvisibleSpellcheck()
     {
         kick(1, 8, WebTextDecorationTypeInvisibleSpellcheck);
     }
 
 private:
     void kick(int misspellingStartOffset, int misspellingLength, WebTextDecorationType type)
     {
         if (!m_completion)
             return;
@@ skipping 76 matching lines @@
 
     element->focus();
     NonThrowableExceptionState exceptionState;
     document->execCommand("InsertText", false, "welcome ", exceptionState);
 
     document->updateStyleAndLayout();
 
     EXPECT_FALSE(exceptionState.hadException());
     auto range = EphemeralRange::rangeOfContents(*element);
     document->markers().addMarker(range.startPosition(), range.endPosition(), DocumentMarker::Spelling);
+    document->markers().addMarker(range.startPosition(), range.endPosition(), DocumentMarker::Grammar);
     document->markers().addMarker(range.startPosition(), range.endPosition(), DocumentMarker::InvisibleSpellcheck);
-    EXPECT_EQ(2U, document->markers().markers().size());
+    EXPECT_EQ(3U, document->markers().markers().size());
 
     spellcheck.kickNoResults();
     EXPECT_EQ(0U, document->markers().markers().size());
 }
 
 TEST_P(ParameterizedWebFrameTest, SpellcheckResultsSavedInDocument)
 {
     registerMockedHttpURLLoad("spell.html");
     FrameTestHelpers::WebViewHelper webViewHelper(this);
     webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
@@ skipping 14 matching lines @@
     EXPECT_FALSE(exceptionState.hadException());
 
     spellcheck.kick();
     ASSERT_EQ(1U, document->markers().markers().size());
     ASSERT_NE(static_cast<DocumentMarker*>(0), document->markers().markers()[0]);
     EXPECT_EQ(DocumentMarker::Spelling, document->markers().markers()[0]->type());
 
     document->execCommand("InsertText", false, "wellcome ", exceptionState);
     EXPECT_FALSE(exceptionState.hadException());
 
+    spellcheck.kickGrammar();
+    ASSERT_EQ(1U, document->markers().markers().size());
+    ASSERT_NE(static_cast<DocumentMarker*>(0), document->markers().markers()[0]);
+    EXPECT_EQ(DocumentMarker::Grammar, document->markers().markers()[0]->type());
+
+    document->execCommand("InsertText", false, "wellcome ", exceptionState);
+    EXPECT_FALSE(exceptionState.hadException());
+
     spellcheck.kickInvisibleSpellcheck();
     ASSERT_EQ(1U, document->markers().markers().size());
     ASSERT_NE(static_cast<DocumentMarker*>(0), document->markers().markers()[0]);
     EXPECT_EQ(DocumentMarker::InvisibleSpellcheck, document->markers().markers()[0]->type());
 }
 
 class TestAccessInitialDocumentWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
 public:
     TestAccessInitialDocumentWebFrameClient() : m_didAccessInitialDocument(false)
     {
@@ skipping 3390 matching lines @@
     request.setRequestorOrigin(WebSecurityOrigin::createUnique());
     helper.webView()->mainFrameImpl()->loadRequest(request);
 
     // Normally, the result of the JS url replaces the existing contents on the
     // Document. However, if the JS triggers a navigation, the contents should
     // not be replaced.
     EXPECT_EQ("", toLocalFrame(helper.webView()->page()->mainFrame())->document()->documentElement()->innerText());
 }
 
 } // namespace blink