Switch the offset conversion routines from...

base/strings/utf_offset_string_conversions.h

Index: base/strings/utf_offset_string_conversions.h
===================================================================
--- base/strings/utf_offset_string_conversions.h	(revision 221015)
+++ base/strings/utf_offset_string_conversions.h	(working copy)
@@ -44,14 +44,14 @@
     std::vector<size_t>* offsets_for_adjustment);
 
 // Limiting function callable by std::for_each which will replace any value
-// which is equal to or greater than |limit| with npos.
+// which is greater than |limit| with npos.

[msw, 2013/09/04 23:58:50]

I share Will's concern that other callers might have properly expected the old
behavior. Some callers might try size_t i = 1; std::string text = "a";
LimitOffset(...text.length()...); ...text[i]... or similar.

Can you point to the codepath by which SearchProvider exercises this code?

[Peter Kasting, 2013/09/05 20:11:59]

See bug 284781 comment 16 for the full description.

 template <typename T>
 struct LimitOffset {
   explicit LimitOffset(size_t limit)
     : limit_(limit) {}
 
   void operator()(size_t& offset) {
-    if (offset >= limit_)
+    if (offset > limit_)
       offset = T::npos;
   }