Collect spelling service feedback on Mac

chrome/browser/spellchecker/spellcheck_message_filter.cc

Index: chrome/browser/spellchecker/spellcheck_message_filter.cc
diff --git a/chrome/browser/spellchecker/spellcheck_message_filter.cc b/chrome/browser/spellchecker/spellcheck_message_filter.cc
index 4de8b1bde5d08c43ce71554909de0307ab906c5b..091a66ed8647e745183b4a547a574913bf04b387 100644
--- a/chrome/browser/spellchecker/spellcheck_message_filter.cc
+++ b/chrome/browser/spellchecker/spellcheck_message_filter.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
 
+#include <algorithm>
+#include <functional>
+
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ -114,9 +117,16 @@ void SpellCheckMessageFilter::OnCallSpellingService(
     int route_id,
     int identifier,
     const string16& text,
-    const std::vector<SpellCheckMarker>& markers) {
+    std::vector<SpellCheckMarker> markers) {
   DCHECK(!text.empty());
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  // Erase invalid markers (with offsets out of boundaries of text length).
+  markers.erase(
+      std::remove_if(
+          markers.begin(),
+          markers.end(),
+          std::not1(SpellCheckMarker::IsValidPredicate(text.length()))),
+      markers.end());
   CallSpellingService(text, route_id, identifier, markers);
 }