Switch the offset conversion routines from...

base/strings/utf_offset_string_conversions.cc

 // Copyright (c) 2011 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 "base/strings/utf_offset_string_conversions.h"
 
 #include <algorithm>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
@@ skipping 130 matching lines @@
 void OffsetAdjuster::Add(const Adjustment& adjustment) {
   adjustments_.push_back(adjustment);
 }
 
 void OffsetAdjuster::AdjustOffset(std::vector<size_t>::iterator offset) {
   if (*offset == string16::npos)
     return;
   size_t adjustment = 0;
   for (std::vector<Adjustment>::const_iterator i = adjustments_.begin();
        i != adjustments_.end(); ++i) {
-    if (*offset == i->original_offset && i->output_length == 0) {
-      *offset = string16::npos;
-      return;
-    }
     if (*offset <= i->original_offset)
       break;
     if (*offset < (i->original_offset + i->original_length)) {
       *offset = string16::npos;
       return;
     }
     adjustment += (i->original_length - i->output_length);
   }
   *offset -= adjustment;
 }
 
 }  // namespace base