base::OffsetAdjuster: Refactor offset limiting logic into the base::OffsetAdjuster

base/strings/utf_offset_string_conversions_unittest.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 <stddef.h>
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 59 matching lines @@
   for (size_t i = 0; i < arraysize(utf16_to_utf8_cases); ++i) {
     size_t offset = utf16_to_utf8_cases[i].input_offset;
     std::vector<size_t> offsets;
     offsets.push_back(offset);
     UTF16ToUTF8AndAdjustOffsets(utf16_to_utf8_cases[i].utf16, &offsets);
     EXPECT_EQ(utf16_to_utf8_cases[i].output_offset, offsets[0]) << i;
   }
 }
 
 TEST(UTFOffsetStringConversionsTest, LimitOffsets) {
+  const OffsetAdjuster::Adjustments kNoAdjustments;
   const size_t kLimit = 10;
   const size_t kItems = 20;
   std::vector<size_t> size_ts;
-  for (size_t t = 0; t < kItems; ++t)
+  for (size_t t = 0; t < kItems; ++t) {
     size_ts.push_back(t);
-  std::for_each(size_ts.begin(), size_ts.end(),
-                LimitOffset<string16>(kLimit));
+    OffsetAdjuster::AdjustOffset(kNoAdjustments, &size_ts.back(), kLimit);
+  }
   size_t unlimited_count = 0;
   for (std::vector<size_t>::iterator ti = size_ts.begin(); ti != size_ts.end();
        ++ti) {
     if (*ti != kNpos)
       ++unlimited_count;
   }
   EXPECT_EQ(11U, unlimited_count);
 
   // Reverse the values in the vector and try again.
   size_ts.clear();
-  for (size_t t = kItems; t > 0; --t)
+  for (size_t t = kItems; t > 0; --t) {
     size_ts.push_back(t - 1);
-  std::for_each(size_ts.begin(), size_ts.end(),
-                LimitOffset<string16>(kLimit));
+    OffsetAdjuster::AdjustOffset(kNoAdjustments, &size_ts.back(), kLimit);
+  }
   unlimited_count = 0;
   for (std::vector<size_t>::iterator ti = size_ts.begin(); ti != size_ts.end();
        ++ti) {
     if (*ti != kNpos)
       ++unlimited_count;
   }
   EXPECT_EQ(11U, unlimited_count);
 }
 
 TEST(UTFOffsetStringConversionsTest, AdjustOffsets) {
@@ skipping 179 matching lines @@
   EXPECT_EQ(1u, adjustments_on_adjusted_string[3].output_length);
   EXPECT_EQ(19u, adjustments_on_adjusted_string[4].original_offset);
   EXPECT_EQ(3u, adjustments_on_adjusted_string[4].original_length);
   EXPECT_EQ(0u, adjustments_on_adjusted_string[4].output_length);
   EXPECT_EQ(25u, adjustments_on_adjusted_string[5].original_offset);
   EXPECT_EQ(1u, adjustments_on_adjusted_string[5].original_length);
   EXPECT_EQ(2u, adjustments_on_adjusted_string[5].output_length);
 }
 
 }  // namespace base