base/i18n: Put break_iterator* into namespace i18n.

BUG=None
TEST=None

R=brettw@chromium.org

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

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

10 files changed, 44 insertions, 28 deletions

diff --git a/base/i18n/break_iterator.cc b/base/i18n/break_iterator.cc
index edc8950..118600a 100644
--- a/base/i18n/break_iterator.cc
+++ b/base/i18n/break_iterator.cc
@@ -10,6 +10,7 @@
 #include "unicode/ustring.h"
 
 namespace base {
+namespace i18n {
 
 const size_t npos = -1;
 
@@ -98,4 +99,5 @@ string16 BreakIterator::GetString() const {
   return string_->substr(prev_, pos_ - prev_);
 }
 
+}  // namespace i18n
 }  // namespace base
diff --git a/base/i18n/break_iterator.h b/base/i18n/break_iterator.h
index f64a1e1..acd5c30 100644
--- a/base/i18n/break_iterator.h
+++ b/base/i18n/break_iterator.h
@@ -52,6 +52,7 @@
 //   }
 
 namespace base {
+namespace i18n {
 
 class BreakIterator {
  public:
@@ -116,6 +117,7 @@ class BreakIterator {
   DISALLOW_COPY_AND_ASSIGN(BreakIterator);
 };
 
+}  // namespace i18n
 }  // namespace base
 
-#endif  // BASE_I18N_BREAK_ITERATOR_H__
+#endif  // BASE_I18N_BREAK_ITERATOR_H_
diff --git a/base/i18n/break_iterator_unittest.cc b/base/i18n/break_iterator_unittest.cc
index a0bcee1..bc0cca3 100644
--- a/base/i18n/break_iterator_unittest.cc
+++ b/base/i18n/break_iterator_unittest.cc
@@ -1,17 +1,20 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/i18n/break_iterator.h"
 
-#include "base/stringprintf.h"
 #include "base/string_piece.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace base {
+namespace i18n {
+
 TEST(BreakIteratorTest, BreakWordEmpty) {
   string16 empty;
-  base::BreakIterator iter(&empty, base::BreakIterator::BREAK_WORD);
+  BreakIterator iter(&empty, BreakIterator::BREAK_WORD);
   ASSERT_TRUE(iter.Init());
   EXPECT_FALSE(iter.Advance());
   EXPECT_FALSE(iter.IsWord());
@@ -22,7 +25,7 @@ TEST(BreakIteratorTest, BreakWordEmpty) {
 TEST(BreakIteratorTest, BreakWord) {
   string16 space(UTF8ToUTF16(" "));
   string16 str(UTF8ToUTF16(" foo bar! \npouet boom"));
-  base::BreakIterator iter(&str, base::BreakIterator::BREAK_WORD);
+  BreakIterator iter(&str, BreakIterator::BREAK_WORD);
   ASSERT_TRUE(iter.Init());
   EXPECT_TRUE(iter.Advance());
   EXPECT_FALSE(iter.IsWord());
@@ -67,7 +70,7 @@ TEST(BreakIteratorTest, BreakWide16) {
       L"\x03bf\x03c2\x0020\x0399\x03c3\x03c4\x03cc\x03c2"));
   const string16 word1(str.substr(0, 10));
   const string16 word2(str.substr(11, 5));
-  base::BreakIterator iter(&str, base::BreakIterator::BREAK_WORD);
+  BreakIterator iter(&str, BreakIterator::BREAK_WORD);
   ASSERT_TRUE(iter.Init());
   EXPECT_TRUE(iter.Advance());
   EXPECT_TRUE(iter.IsWord());
@@ -91,7 +94,7 @@ TEST(BreakIteratorTest, BreakWide32) {
       UTF8ToUTF16(base::StringPrintf("%s a", very_wide_char)));
   const string16 very_wide_word(str.substr(0, 2));
 
-  base::BreakIterator iter(&str, base::BreakIterator::BREAK_WORD);
+  BreakIterator iter(&str, BreakIterator::BREAK_WORD);
   ASSERT_TRUE(iter.Init());
   EXPECT_TRUE(iter.Advance());
   EXPECT_TRUE(iter.IsWord());
@@ -110,7 +113,7 @@ TEST(BreakIteratorTest, BreakWide32) {
 
 TEST(BreakIteratorTest, BreakSpaceEmpty) {
   string16 empty;
-  base::BreakIterator iter(&empty, base::BreakIterator::BREAK_SPACE);
+  BreakIterator iter(&empty, BreakIterator::BREAK_SPACE);
   ASSERT_TRUE(iter.Init());
   EXPECT_FALSE(iter.Advance());
   EXPECT_FALSE(iter.IsWord());
@@ -120,7 +123,7 @@ TEST(BreakIteratorTest, BreakSpaceEmpty) {
 
 TEST(BreakIteratorTest, BreakSpace) {
   string16 str(UTF8ToUTF16(" foo bar! \npouet boom"));
-  base::BreakIterator iter(&str, base::BreakIterator::BREAK_SPACE);
+  BreakIterator iter(&str, BreakIterator::BREAK_SPACE);
   ASSERT_TRUE(iter.Init());
   EXPECT_TRUE(iter.Advance());
   EXPECT_FALSE(iter.IsWord());
@@ -145,7 +148,7 @@ TEST(BreakIteratorTest, BreakSpace) {
 
 TEST(BreakIteratorTest, BreakSpaceSP) {
   string16 str(UTF8ToUTF16(" foo bar! \npouet boom "));
-  base::BreakIterator iter(&str, base::BreakIterator::BREAK_SPACE);
+  BreakIterator iter(&str, BreakIterator::BREAK_SPACE);
   ASSERT_TRUE(iter.Init());
   EXPECT_TRUE(iter.Advance());
   EXPECT_FALSE(iter.IsWord());
@@ -175,7 +178,7 @@ TEST(BreakIteratorTest, BreakSpacekWide16) {
       L"\x03bf\x03c2\x0020\x0399\x03c3\x03c4\x03cc\x03c2"));
   const string16 word1(str.substr(0, 11));
   const string16 word2(str.substr(11, 5));
-  base::BreakIterator iter(&str, base::BreakIterator::BREAK_SPACE);
+  BreakIterator iter(&str, BreakIterator::BREAK_SPACE);
   ASSERT_TRUE(iter.Init());
   EXPECT_TRUE(iter.Advance());
   EXPECT_FALSE(iter.IsWord());
@@ -196,7 +199,7 @@ TEST(BreakIteratorTest, BreakSpaceWide32) {
       UTF8ToUTF16(base::StringPrintf("%s a", very_wide_char)));
   const string16 very_wide_word(str.substr(0, 3));
 
-  base::BreakIterator iter(&str, base::BreakIterator::BREAK_SPACE);
+  BreakIterator iter(&str, BreakIterator::BREAK_SPACE);
   ASSERT_TRUE(iter.Init());
   EXPECT_TRUE(iter.Advance());
   EXPECT_FALSE(iter.IsWord());
@@ -212,7 +215,7 @@ TEST(BreakIteratorTest, BreakSpaceWide32) {
 
 TEST(BreakIteratorTest, BreakLineEmpty) {
   string16 empty;
-  base::BreakIterator iter(&empty, base::BreakIterator::BREAK_NEWLINE);
+  BreakIterator iter(&empty, BreakIterator::BREAK_NEWLINE);
   ASSERT_TRUE(iter.Init());
   EXPECT_FALSE(iter.Advance());
   EXPECT_FALSE(iter.IsWord());
@@ -223,7 +226,7 @@ TEST(BreakIteratorTest, BreakLineEmpty) {
 TEST(BreakIteratorTest, BreakLine) {
   string16 nl(UTF8ToUTF16("\n"));
   string16 str(UTF8ToUTF16("\nfoo bar!\n\npouet boom"));
-  base::BreakIterator iter(&str, base::BreakIterator::BREAK_NEWLINE);
+  BreakIterator iter(&str, BreakIterator::BREAK_NEWLINE);
   ASSERT_TRUE(iter.Init());
   EXPECT_TRUE(iter.Advance());
   EXPECT_FALSE(iter.IsWord());
@@ -246,7 +249,7 @@ TEST(BreakIteratorTest, BreakLine) {
 TEST(BreakIteratorTest, BreakLineNL) {
   string16 nl(UTF8ToUTF16("\n"));
   string16 str(UTF8ToUTF16("\nfoo bar!\n\npouet boom\n"));
-  base::BreakIterator iter(&str, base::BreakIterator::BREAK_NEWLINE);
+  BreakIterator iter(&str, BreakIterator::BREAK_NEWLINE);
   ASSERT_TRUE(iter.Init());
   EXPECT_TRUE(iter.Advance());
   EXPECT_FALSE(iter.IsWord());
@@ -273,7 +276,7 @@ TEST(BreakIteratorTest, BreakLineWide16) {
       L"\x03bf\x03c2\x000a\x0399\x03c3\x03c4\x03cc\x03c2"));
   const string16 line1(str.substr(0, 11));
   const string16 line2(str.substr(11, 5));
-  base::BreakIterator iter(&str, base::BreakIterator::BREAK_NEWLINE);
+  BreakIterator iter(&str, BreakIterator::BREAK_NEWLINE);
   ASSERT_TRUE(iter.Init());
   EXPECT_TRUE(iter.Advance());
   EXPECT_FALSE(iter.IsWord());
@@ -293,7 +296,7 @@ TEST(BreakIteratorTest, BreakLineWide32) {
   const string16 str(
       UTF8ToUTF16(base::StringPrintf("%s\na", very_wide_char)));
   const string16 very_wide_line(str.substr(0, 3));
-  base::BreakIterator iter(&str, base::BreakIterator::BREAK_NEWLINE);
+  BreakIterator iter(&str, BreakIterator::BREAK_NEWLINE);
   ASSERT_TRUE(iter.Init());
   EXPECT_TRUE(iter.Advance());
   EXPECT_FALSE(iter.IsWord());
@@ -306,3 +309,6 @@ TEST(BreakIteratorTest, BreakLineWide32) {
   EXPECT_FALSE(iter.Advance());   // Test unexpected advance after end.
   EXPECT_FALSE(iter.IsWord());
 }
+
+}  // namespace i18n
+}  // namespace base
diff --git a/chrome/browser/history/in_memory_url_index.cc b/chrome/browser/history/in_memory_url_index.cc
index f2c2bf3..500ed77 100644
--- a/chrome/browser/history/in_memory_url_index.cc
+++ b/chrome/browser/history/in_memory_url_index.cc
@@ -486,8 +486,10 @@ InMemoryURLIndex::String16Set InMemoryURLIndex::WordSetFromString16(
 InMemoryURLIndex::String16Vector InMemoryURLIndex::WordVectorFromString16(
     const string16& uni_string,
     bool break_on_space) {
-  base::BreakIterator iter(&uni_string, break_on_space ?
-      base::BreakIterator::BREAK_SPACE : base::BreakIterator::BREAK_WORD);
+  base::i18n::BreakIterator iter(
+      &uni_string,
+      break_on_space ? base::i18n::BreakIterator::BREAK_SPACE
+                     : base::i18n::BreakIterator::BREAK_WORD);
   String16Vector words;
   if (!iter.Init())
     return words;
diff --git a/chrome/browser/history/query_parser.cc b/chrome/browser/history/query_parser.cc
index 521c6c3..476045f 100644
--- a/chrome/browser/history/query_parser.cc
+++ b/chrome/browser/history/query_parser.cc
@@ -354,7 +354,7 @@ bool QueryParser::DoesQueryMatch(const string16& text,
 }
 
 bool QueryParser::ParseQueryImpl(const string16& query, QueryNodeList* root) {
-  base::BreakIterator iter(&query, base::BreakIterator::BREAK_WORD);
+  base::i18n::BreakIterator iter(&query, base::i18n::BreakIterator::BREAK_WORD);
   // TODO(evanm): support a locale here
   if (!iter.Init())
     return false;
@@ -395,7 +395,7 @@ bool QueryParser::ParseQueryImpl(const string16& query, QueryNodeList* root) {
 
 void QueryParser::ExtractQueryWords(const string16& text,
                                     std::vector<QueryWord>* words) {
-  base::BreakIterator iter(&text, base::BreakIterator::BREAK_WORD);
+  base::i18n::BreakIterator iter(&text, base::i18n::BreakIterator::BREAK_WORD);
   // TODO(evanm): support a locale here
   if (!iter.Init())
     return;
diff --git a/chrome/browser/ui/title_prefix_matcher.cc b/chrome/browser/ui/title_prefix_matcher.cc
index 488ec8c1..906304c 100644
--- a/chrome/browser/ui/title_prefix_matcher.cc
+++ b/chrome/browser/ui/title_prefix_matcher.cc
@@ -80,7 +80,8 @@ void TitlePrefixMatcher::CalculatePrefixLengths(
     // titles that are from the same hostname.
     string16 hostname = ASCIIToUTF16(title_info.url.host());
     // We only create prefixes at word boundaries.
-    base::BreakIterator iter(title, base::BreakIterator::BREAK_WORD);
+    base::i18n::BreakIterator iter(title,
+                                   base::i18n::BreakIterator::BREAK_WORD);
     // We ignore this title if we can't break it into words, or if it only
     // contains a single word.
     if (!iter.Init() || !iter.Advance())
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc
index b33048c..5de7eb3 100644
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -1078,7 +1078,7 @@ void DownloadItemView::SizeLabelToMinWidth() {
   // Using BREAK_WORD can work in most cases, but it can also break
   // lines where it should not. Using BREAK_LINE is safer although
   // slower for Chinese/Japanese. This is not perf-critical at all, though.
-  base::BreakIterator iter(&text, base::BreakIterator::BREAK_LINE);
+  base::i18n::BreakIterator iter(&text, base::i18n::BreakIterator::BREAK_LINE);
   bool status = iter.Init();
   DCHECK(status);
 
diff --git a/ui/base/text/text_elider.cc b/ui/base/text/text_elider.cc
index a04736e..c005997 100644
--- a/ui/base/text/text_elider.cc
+++ b/ui/base/text/text_elider.cc
@@ -576,7 +576,8 @@ class RectangleString {
 };
 
 void RectangleString::AddString(const string16& input) {
-  base::BreakIterator lines(&input, base::BreakIterator::BREAK_NEWLINE);
+  base::i18n::BreakIterator lines(&input,
+                                  base::i18n::BreakIterator::BREAK_NEWLINE);
   if (lines.Init()) {
     while (lines.Advance())
       AddLine(lines.GetString());
@@ -597,7 +598,8 @@ void RectangleString::AddLine(const string16& line) {
   if (line.length() < max_cols_) {
     Append(line);
   } else {
-    base::BreakIterator words(&line, base::BreakIterator::BREAK_SPACE);
+    base::i18n::BreakIterator words(&line,
+                                    base::i18n::BreakIterator::BREAK_SPACE);
     if (words.Init()) {
       while (words.Advance())
         AddWord(words.GetString());
diff --git a/views/controls/textfield/textfield_views_model.cc b/views/controls/textfield/textfield_views_model.cc
index c0f6458..50d9662 100644
--- a/views/controls/textfield/textfield_views_model.cc
+++ b/views/controls/textfield/textfield_views_model.cc
@@ -431,7 +431,7 @@ void TextfieldViewsModel::MoveCursorToPreviousWord(bool select) {
   // This is probably fast enough for our usage, but we may
   // want to modify WordIterator so that it can start from the
   // middle of string and advance backwards.
-  base::BreakIterator iter(&text_, base::BreakIterator::BREAK_WORD);
+  base::i18n::BreakIterator iter(&text_, base::i18n::BreakIterator::BREAK_WORD);
   bool success = iter.Init();
   DCHECK(success);
   if (!success)
@@ -463,7 +463,7 @@ void TextfieldViewsModel::MoveCursorToPreviousWord(bool select) {
 void TextfieldViewsModel::MoveCursorToNextWord(bool select) {
   if (HasCompositionText())
     ConfirmCompositionText();
-  base::BreakIterator iter(&text_, base::BreakIterator::BREAK_WORD);
+  base::i18n::BreakIterator iter(&text_, base::i18n::BreakIterator::BREAK_WORD);
   bool success = iter.Init();
   DCHECK(success);
   if (!success)
diff --git a/views/view_text_utils.cc b/views/view_text_utils.cc
index d221e19..025ecdd 100644
--- a/views/view_text_utils.cc
+++ b/views/view_text_utils.cc
@@ -98,7 +98,8 @@ 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));
-  base::BreakIterator iter(&text16, base::BreakIterator::BREAK_SPACE);
+  base::i18n::BreakIterator iter(&text16,
+                                 base::i18n::BreakIterator::BREAK_SPACE);
   if (!iter.Init())
     return;