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

base/strings/utf_offset_string_conversions_unittest.cc

Index: base/strings/utf_offset_string_conversions_unittest.cc
diff --git a/base/strings/utf_offset_string_conversions_unittest.cc b/base/strings/utf_offset_string_conversions_unittest.cc
index fe0e4da81af26b80cd8c68a17904ccbd8ff19fa0..31b875b526f0d56b08fa281787871a109ae8abde 100644
--- a/base/strings/utf_offset_string_conversions_unittest.cc
+++ b/base/strings/utf_offset_string_conversions_unittest.cc
@@ -77,13 +77,14 @@ TEST(UTFOffsetStringConversionsTest, AdjustOffset) {
 }
 
 TEST(UTFOffsetStringConversionsTest, LimitOffsets) {
+  OffsetAdjuster::Adjustments no_adjustments;

[Peter Kasting, 2017/07/08 02:23:20]

Nit: const?  constexpr?  Name kNoAdjustments?  Maybe just inline below?

[tommycli, 2017/07/10 17:10:30]

Done. I did const 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(no_adjustments, &size_ts.back(), kLimit);
+  }
   size_t unlimited_count = 0;
   for (std::vector<size_t>::iterator ti = size_ts.begin(); ti != size_ts.end();
        ++ti) {
@@ -94,10 +95,10 @@ TEST(UTFOffsetStringConversionsTest, LimitOffsets) {
 
   // 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(no_adjustments, &size_ts.back(), kLimit);
+  }
   unlimited_count = 0;
   for (std::vector<size_t>::iterator ti = size_ts.begin(); ti != size_ts.end();
        ++ti) {