Revert removal of grammar checking and marking code

components/test_runner/spell_check_client.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/test_runner/spell_check_client.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "components/test_runner/mock_grammar_check.h"
 #include "components/test_runner/test_runner.h"
 #include "components/test_runner/web_task.h"
 #include "components/test_runner/web_test_delegate.h"
 #include "third_party/WebKit/public/web/WebTextCheckingCompletion.h"
 #include "third_party/WebKit/public/web/WebTextCheckingResult.h"
 
 namespace test_runner {
 
 SpellCheckClient::SpellCheckClient(TestRunner* test_runner)
     : last_requested_text_checking_completion_(nullptr),
@@ skipping 35 matching lines @@
       if (!misspelled_length)
         break;
       blink::WebTextCheckingResult result;
       result.decoration = blink::WebTextDecorationTypeSpelling;
       result.location = offset + misspelled_position;
       result.length = misspelled_length;
       results.push_back(result);
       offset += misspelled_position + misspelled_length;
     }
   }
+  if (mask & blink::WebTextCheckingTypeGrammar)
+    MockGrammarCheck::CheckGrammarOfString(text, &results);
   web_results->assign(results);
 }
 
 void SpellCheckClient::requestCheckingOfText(
     const blink::WebString& text,
     const blink::WebVector<uint32_t>& markers,
     const blink::WebVector<unsigned>& marker_offsets,
     blink::WebTextCheckingCompletion* completion) {
   if (text.isEmpty()) {
     if (completion)
@@ skipping 34 matching lines @@
           blink::WebString(text.substr(misspelled_position, misspelled_length)),
           &suggestions);
       results.push_back(blink::WebTextCheckingResult(
           blink::WebTextDecorationTypeSpelling,
           offset + misspelled_position,
           misspelled_length,
           suggestions.isEmpty() ? blink::WebString() : suggestions[0]));
       text = text.substr(misspelled_position + misspelled_length);
       offset += misspelled_position + misspelled_length;
     }
+    MockGrammarCheck::CheckGrammarOfString(last_requested_text_check_string_,
+                                           &results);
   }
   last_requested_text_checking_completion_->didFinishCheckingText(results);
   last_requested_text_checking_completion_ = 0;
 
   if (test_runner_->shouldDumpSpellCheckCallbacks())
     delegate_->PrintMessage("SpellCheckEvent: FinishLastTextCheck\n");
 }
 
 }  // namespace test_runner