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 cdaa9d010674d938237a58835065b673a95808a5..ec343b1bc08d936c15379446b452be25f4410e62 100644
--- a/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc
+++ b/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc
@@ -141,11 +141,20 @@ 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)) {
+    SpellcheckWordIterator::WordIteratorStatus status =
+        iterator.GetNextWord(&actual_word, &actual_start, &actual_end);

[please use gerrit instead, 2015/08/11 22:54:11]

for loop the heck out of this one.

[Julius, 2015/08/12 20:25:59]

Done.

+    while (status !=
+           SpellcheckWordIterator::WordIteratorStatus::IS_END_OF_TEXT) {
+      if (status ==
+          SpellcheckWordIterator::WordIteratorStatus::IS_SKIPPABLE_CHAR) {
+        status = iterator.GetNextWord(&actual_word, &actual_start, &actual_end);
+        continue;
+      }
       EXPECT_TRUE(index < expected_words.size());
       if (index < expected_words.size())
         EXPECT_EQ(expected_words[index], actual_word);
       ++index;
+      status = iterator.GetNextWord(&actual_word, &actual_start, &actual_end);
     }
   }
 }
@@ -169,7 +178,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;

[please use gerrit instead, 2015/08/11 22:54:11]

for loop.

[Julius, 2015/08/12 20:25:59]

Done.

+  do {
+    status = iterator.GetNextWord(&actual_word, &actual_start, &actual_end);
+  } while (status ==
+           SpellcheckWordIterator::WordIteratorStatus::IS_SKIPPABLE_CHAR);
+
+  EXPECT_EQ(status, SpellcheckWordIterator::WordIteratorStatus::IS_END_OF_TEXT);

[please use gerrit instead, 2015/08/11 22:54:11]

Expected value (SpellcheckWordIterator::WordIteratorStatus::IS_END_OF_TEXT) goes
into EXPECT_EQ() first:

EXPECT_EQ(expected, actual);

i.e.:

EXPECT_EQ(SpellcheckWordIterator::WordIteratorStatus::IS_END_OF_TEXT, status);

[Julius, 2015/08/12 20:25:59]

Done.

   EXPECT_EQ(0, actual_start);
   EXPECT_EQ(0, actual_end);
 }
@@ -230,7 +245,13 @@ 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;

[please use gerrit instead, 2015/08/11 22:54:11]

for















loop

[Julius, 2015/08/12 20:25:59]

D
o
n
e
.

+    do {
+      status = iterator.GetNextWord(&actual_word, &actual_start, &actual_end);
+    } while (status ==
+             SpellcheckWordIterator::WordIteratorStatus::IS_SKIPPABLE_CHAR);
+
+    EXPECT_EQ(status, SpellcheckWordIterator::WordIteratorStatus::IS_WORD);
     if (kTestCases[i].left_to_right)
       EXPECT_EQ(input_word, actual_word);
     else
@@ -278,7 +299,13 @@ 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;
+    do {
+      status = iterator.GetNextWord(&actual_word, &actual_start, &actual_end);
+    } while (status ==
+             SpellcheckWordIterator::WordIteratorStatus::IS_SKIPPABLE_CHAR);
+
+    EXPECT_EQ(status, SpellcheckWordIterator::WordIteratorStatus::IS_WORD);
     EXPECT_EQ(input_word, actual_word);
     EXPECT_EQ(0, actual_start);
     EXPECT_EQ(input_word.length(),