Updates SpellcheckWordIterator::GetNextWord to return an enum.

chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc

Index: chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc
diff --git a/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc b/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc
index 7b233e9462e2fd020840b25a5e602d28fe0478c3..04f91d820f8103567227c2c079ed2596a02d05bf 100644
--- a/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc
+++ b/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc
@@ -141,7 +141,14 @@ TEST(SpellcheckWordIteratorTest, SplitWord) {
     base::string16 actual_word;
     int actual_start, actual_end;
     size_t index = 0;
-    while (iterator.GetNextWord(&actual_word, &actual_start, &actual_end)) {
+    for (SpellcheckWordIterator::WordIteratorStatus status =
+             iterator.GetNextWord(&actual_word, &actual_start, &actual_end);
+         status != SpellcheckWordIterator::IS_END_OF_TEXT;
+         status =
+             iterator.GetNextWord(&actual_word, &actual_start, &actual_end)) {
+      if (status == SpellcheckWordIterator::WordIteratorStatus::IS_SKIPPABLE)
+        continue;
+
       EXPECT_TRUE(index < expected_words.size());
       if (index < expected_words.size())
         EXPECT_EQ(expected_words[index], actual_word);
@@ -169,7 +176,13 @@ TEST(SpellcheckWordIteratorTest, RuleSetConsistency) {
   // test succeeds if this call returns without timeouts.
   base::string16 actual_word;
   int actual_start, actual_end;
-  EXPECT_FALSE(iterator.GetNextWord(&actual_word, &actual_start, &actual_end));
+  SpellcheckWordIterator::WordIteratorStatus status;
+  for (status = iterator.GetNextWord(&actual_word, &actual_start, &actual_end);
+       status == SpellcheckWordIterator::IS_SKIPPABLE;
+       status = iterator.GetNextWord(&actual_word, &actual_start, &actual_end))
+    continue;

[please use gerrit instead, 2015/08/12 21:01:09]

We usually use curly braces for the body of a for loop where either for(...) or
the body spans multiple lines. This for(...) has three lines, so you should use
curly braces around "continue;".

[Julius, 2015/08/12 23:42:28]

Yeah, wasn't quite sure about this. Didn't see it in the style guide but might
have missed it.

+
+  EXPECT_EQ(SpellcheckWordIterator::WordIteratorStatus::IS_END_OF_TEXT, status);
   EXPECT_EQ(0, actual_start);
   EXPECT_EQ(0, actual_end);
 }
@@ -230,7 +243,15 @@ TEST(SpellcheckWordIteratorTest, TreatNumbersAsWordCharacters) {
 
     base::string16 actual_word;
     int actual_start, actual_end;
-    EXPECT_TRUE(iterator.GetNextWord(&actual_word, &actual_start, &actual_end));
+    SpellcheckWordIterator::WordIteratorStatus status;
+    for (status =
+             iterator.GetNextWord(&actual_word, &actual_start, &actual_end);
+         status == SpellcheckWordIterator::IS_SKIPPABLE;
+         status =
+             iterator.GetNextWord(&actual_word, &actual_start, &actual_end))
+      continue;
+
+    EXPECT_EQ(SpellcheckWordIterator::WordIteratorStatus::IS_WORD, status);
     if (kTestCases[i].left_to_right)
       EXPECT_EQ(input_word, actual_word);
     else
@@ -278,7 +299,14 @@ TEST(SpellcheckWordIteratorTest, TypographicalApostropheIsPartOfWord) {
 
     base::string16 actual_word;
     int actual_start, actual_end;
-    EXPECT_TRUE(iterator.GetNextWord(&actual_word, &actual_start, &actual_end));
+    SpellcheckWordIterator::WordIteratorStatus status;
+    for (status =
+             iterator.GetNextWord(&actual_word, &actual_start, &actual_end);
+         status == SpellcheckWordIterator::IS_SKIPPABLE;
+         iterator.GetNextWord(&actual_word, &actual_start, &actual_end))
+      continue;
+
+    EXPECT_EQ(SpellcheckWordIterator::WordIteratorStatus::IS_WORD, status);
     EXPECT_EQ(input_word, actual_word);
     EXPECT_EQ(0, actual_start);
     EXPECT_EQ(input_word.length(),