Commiting second word iterator patch for tsepez. this was originally reviewed at http://codereview.chromium.org/5796003/

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

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

1 files changed, 3 insertions, 3 deletions

diff --git a/views/view_text_utils.cc b/views/view_text_utils.cc
index 73bef45..df42544 100644
--- a/views/view_text_utils.cc
+++ b/views/view_text_utils.cc
@@ -5,7 +5,7 @@
 #include "views/view_text_utils.h"
 
 #include "app/bidi_line_iterator.h"
-#include "base/i18n/word_iterator.h"
+#include "base/i18n/break_iterator.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
@@ -98,7 +98,7 @@ void DrawTextStartingFrom(gfx::Canvas* canvas,
   // Iterate through line breaking opportunities (which in English would be
   // spaces and such). This tells us where to wrap.
   string16 text16(WideToUTF16(text));
-  WordIterator iter(&text16, WordIterator::BREAK_LINE);
+  base::BreakIterator iter(&text16, base::BreakIterator::BREAK_SPACE);
   if (!iter.Init())
     return;
 
@@ -112,7 +112,7 @@ void DrawTextStartingFrom(gfx::Canvas* canvas,
     // Get the word and figure out the dimensions.
     std::wstring word;
     if (!ltr_within_rtl)
-      word = UTF16ToWide(iter.GetWord());  // Get the next word.
+      word = UTF16ToWide(iter.GetString());  // Get the next word.
     else
       word = text;  // Draw the whole text at once.