Make WordIterator and Snippet::MatchPositions use size_t instead of int for offsets into strings. This avoids some casts. I also added a typedef for Snippet::MatchPosition which cleans up a bit of the calling code a little.

Review URL: http://codereview.chromium.org/13064

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6260 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 9 deletions

diff --git a/base/word_iterator.cc b/base/word_iterator.cc
index 9137f71..1e59a2f 100644
--- a/base/word_iterator.cc
+++ b/base/word_iterator.cc
@@ -8,7 +8,7 @@
 #include "unicode/ubrk.h"
 #include "unicode/ustring.h"
 
-const int WordIterator::npos = -1;
+const size_t npos = -1;
 
 WordIterator::WordIterator(const std::wstring& str, BreakType break_type)
     : iter_(NULL),
@@ -72,7 +72,7 @@ bool WordIterator::Advance() {
     pos_ = npos;
     return false;
   } else {
-    pos_ = static_cast<int>(pos);
+    pos_ = static_cast<size_t>(pos);
     return true;
   }
 }
@@ -82,7 +82,7 @@ bool WordIterator::IsWord() const {
 }
 
 std::wstring WordIterator::GetWord() const {
-  DCHECK(prev_ >= 0 && pos_ >= 0);
+  DCHECK(prev_ != npos && pos_ != npos);
   return string_.substr(prev_, pos_ - prev_);
 }
 
diff --git a/base/word_iterator.h b/base/word_iterator.h
index f41d767..d69b327 100644
--- a/base/word_iterator.h
+++ b/base/word_iterator.h
@@ -45,12 +45,9 @@ class WordIterator {
 
   // Return the current break position within the string,
   // or WordIterator::npos when done.
-  int pos() const { return pos_; }
+  size_t pos() const { return pos_; }
   // Return the value of pos() returned before Advance() was last called.
-  int prev() const { return prev_; }
-
-  // A special position value indicating "end of string".
-  static const int npos;
+  size_t prev() const { return prev_; }
 
   // Advance to the next break.  Returns false if we've run past the end of
   // the string.  (Note that the very last "word break" is after the final
@@ -82,7 +79,7 @@ class WordIterator {
   BreakType break_type_;
 
   // Previous and current iterator positions.
-  int prev_, pos_;
+  size_t prev_, pos_;
 
   DISALLOW_EVIL_CONSTRUCTORS(WordIterator);
 };